]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2a8abca) | patch
Ensure that a hunk-header never appears in the middle of an Extraneous range.
authorNeil Brown <neilb@suse.de>
Tue, 8 May 2012 06:18:31 +0000 (16:18 +1000)
committerNeil Brown <neilb@suse.de>
Tue, 8 May 2012 06:18:31 +0000 (16:18 +1000)
commit6aac0c2c25cc6d10004ecdf4d2c025828b217d31
treea49c882f5969a3b6e99997de7e2ee2b4065b4ad2tree | snapshot
parent2a8abcaafe0b9e7c83ba5dead3c4bd0aee4a377dcommit | diff
Ensure that a hunk-header never appears in the middle of an Extraneous range.

A hunk header is always Extraneous.  However Extraneous text before it is
quite separate and is best kept separate.
Start a new Extraneous merger with each hunk header will make it easier
to detect hunk headers and handle them better.

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