]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b56cce2) | patch
vpatch: discard 'ignored' for 'oldtype'.
authorNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 06:24:18 +0000 (16:24 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 06:24:18 +0000 (16:24 +1000)
commitf3e76fb2c7715c8f8143fc462ab030e198d381b5
treee8a35d6fd53eaa768bc3d2b6f9578440abfb2de1tree | snapshot
parentb56cce2326fb5a5bd0d98a3932e041802a8d6e4acommit | diff
vpatch: discard 'ignored' for 'oldtype'.

Rather than 'ignore'ing certain merges, we allow the type
of each merger to be modified.  This feels more flexible and
should be easier to understand.

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