]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6e11b2c) | patch
vpatch: allow changes to be ignored as well as conflict.
authorNeilBrown <neilb@suse.de>
Thu, 15 Nov 2012 02:45:51 +0000 (13:45 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 15 Nov 2012 02:45:51 +0000 (13:45 +1100)
commit60a7bd5641e68e6c44741a80c6c52665004639a8
tree949fc5cc2c40c6d0670893e49e8a1b220d84fc63tree | snapshot
parent6e11b2cda194c0e5679cbfa25276aac213b0b3e7commit | diff
vpatch: allow changes to be ignored as well as conflict.

Because sometimes a 'change' that is found is really a conflict.

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