Tree: e62fad94a6

master

CVS-to-MTN

MTN-to-GIT

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e62fad94a6'

${ noResults }

Commit Graph

3 Commits (e62fad94a6efbb4ec7b06b9e2538aa65e2e3f444)

Author	SHA1	Message	Date
Dr. Ralf S. Engelschall	dce4d4b6ad	document -O option, too	19 years ago
Dr. Ralf S. Engelschall	e0f6ee67c4	Add option "-O" to diff3(1) in order to allow one to display information about the 2nd file (the ancestor/older one) not just under option "-A", but also under "-E" and "-X". This way one especially can get the consise output of "-E" (where only "unmerged" conflicts and overlaps are shown), but still get the verbose information (introduced with "||||||| <older-name>") about the ancestor/older file in the flagged/marked output. This way "diff3 -m -E -O" gives one the best resolution chances on a 3-way merge without having to deal with the useless (already "merged") information one would get under "diff3 -m -A".	19 years ago
Dr. Ralf S. Engelschall	f46db19007	port to FreeBSD 5.0	23 years ago