diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-28 08:10:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 02:41:43 (GMT) |
| commit | e0af48e49682ea3345f932f6b9e7fa7c5e5e611a (patch) | |
| tree | 43cd383edc42ef508071fa6886a9e1fe10a7d281 /builtin-annotate.c | |
| parent | f2b25dd81f4ccbf42700bd15feeb2becf10331ab (diff) | |
| download | git-e0af48e49682ea3345f932f6b9e7fa7c5e5e611a.zip git-e0af48e49682ea3345f932f6b9e7fa7c5e5e611a.tar.gz git-e0af48e49682ea3345f932f6b9e7fa7c5e5e611a.tar.bz2 | |
xdiff-merge: optionally show conflicts in "diff3 -m" style
When showing conflicting merges, we traditionally followed RCS's merge
output format. The output shows:
<<<<<<<
postimage from one side;
=======
postimage of the other side; and
>>>>>>>
Some poeple find it easier to be able to understand what is going on when
they can view the common ancestor's version, which is used by "diff3 -m",
which shows:
<<<<<<<
postimage from one side;
|||||||
shared preimage;
=======
postimage of the other side; and
>>>>>>>
This is an initial step to bring that as an optional feature to git.
Only "git merge-file" has been converted, with "--diff3" option.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions