]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 991a0ca) | patch
Fix off-by-one-error when extracting a merge file.
authorNeil Brown <neilb@suse.de>
Sun, 21 May 2006 23:17:49 +0000 (09:17 +1000)
committerNeil Brown <neilb@suse.de>
Sun, 21 May 2006 23:17:49 +0000 (09:17 +1000)
commitc3c62482bcfc51667335e6c46cdc2eee110ac027
tree37a61541fedfdeb9925428c26ab966725c45cd9ftree | snapshot
parent991a0ca95cf9dc0c173942e9c0bfb193ad63ce53commit | diff
Fix off-by-one-error when extracting a merge file.

If a merge ended at EOF, --extract wouldn't interpret it properly.
extract.c diff | blob | history
p diff | blob | history
apply rejected patches and perform word-wise diffs