| commit | 3f524fcbe3626e5b760ebac76e978232fc64c79d | |
| author | Neil Brown <neilb@suse.de> | |
| Wed, 24 Mar 2010 08:03:39 +0000 (24 19:03 +1100) | ||
| committer | Neil Brown <neilb@suse.de> | |
| Wed, 24 Mar 2010 08:03:39 +0000 (24 19:03 +1100) | ||
| tree | 08ca8f0bbec95a47ffc77a0ef45a8453f44d8162 | treesnapshot (tar.gz zip) |
| parent | b72e6d6e9a58047ca1639c28c95aa959fada6714 | commitdiff |
Add --no-ignore option
This suppresses the optimisation of ignoring conflicts which appear to
be making a change that had already been made.
Signed-off-by: NeilBrown <neilb@suse.de>
This suppresses the optimisation of ignoring conflicts which appear to
be making a change that had already been made.
Signed-off-by: NeilBrown <neilb@suse.de>
| ReadMe.c | diffblobblamehistory | |
| merge2.c | diffblobblamehistory | |
| vpatch.c | diffblobblamehistory | |
| wiggle.1 | diffblobblamehistory | |
| wiggle.c | diffblobblamehistory | |
| wiggle.h | diffblobblamehistory |