| commit | f3e76fb2c7715c8f8143fc462ab030e198d381b5 | |
| author | NeilBrown <neilb@suse.de> | |
| Mon, 19 Aug 2013 06:24:18 +0000 (19 16:24 +1000) | ||
| committer | NeilBrown <neilb@suse.de> | |
| Mon, 19 Aug 2013 06:24:18 +0000 (19 16:24 +1000) | ||
| tree | e8a35d6fd53eaa768bc3d2b6f9578440abfb2de1 | treesnapshot (tar.gz zip) |
| parent | b56cce2326fb5a5bd0d98a3932e041802a8d6e4a | commitdiff |
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>
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 | diffblobblamehistory | |
| vpatch.c | diffblobblamehistory | |
| wiggle.h | diffblobblamehistory |