]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d3898fd) | patch
Improve parsing of diff3 output.
authorNeil Brown <neilb@suse.de>
Wed, 24 Mar 2010 07:53:02 +0000 (18:53 +1100)
committerNeil Brown <neilb@suse.de>
Wed, 24 Mar 2010 07:53:02 +0000 (18:53 +1100)
commitb72e6d6e9a58047ca1639c28c95aa959fada6714
treecc368e95814089c24c0d8d9c32af7b1430f75149tree | snapshot
parentd3898fd5cc8b83aaedb2d1952e3480f0e459504ccommit | diff
Improve parsing of diff3 output.

When diff3 discovers the the 1st and 3rd files match, but differ from
the 2nd it reports:

<<<<<<<
content from second file
=======
content from 1st and 3rd file
>>>>>>>

without a ||||||| line at all.

Enhance the extract code to recognise this.

Signed-off-by: NeilBrown <neilb@suse.de>
extract.c diff | blob | history
apply rejected patches and perform word-wise diffs