You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tree: e0f6ee67c4

master

CVS-to-MTN

MTN-to-GIT

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'e0f6ee67c4'

${ noResults }

openpkg-packages/diffutils

History

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
..
diffutils.patch	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
diffutils.spec	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