]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f3e76fb) | patch
merge: fix another bug in isolate_conflicts.
authorNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 07:44:16 +0000 (17:44 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 07:44:16 +0000 (17:44 +1000)
commit7fae2985a32966da4fadde6a42669cd5364063d9
tree3616e877f437caaba75fc6748f32a2ceba7006a9tree | snapshot
parentf3e76fb2c7715c8f8143fc462ab030e198d381b5commit | diff
merge: fix another bug in isolate_conflicts.

In unusual cases we can fall off the end - better check.

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