]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b72e6d6) | patch
Add --no-ignore option
authorNeil Brown <neilb@suse.de>
Wed, 24 Mar 2010 08:03:39 +0000 (19:03 +1100)
committerNeil Brown <neilb@suse.de>
Wed, 24 Mar 2010 08:03:39 +0000 (19:03 +1100)
commit3f524fcbe3626e5b760ebac76e978232fc64c79d
tree08ca8f0bbec95a47ffc77a0ef45a8453f44d8162tree | snapshot
parentb72e6d6e9a58047ca1639c28c95aa959fada6714commit | diff
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>
ReadMe.c diff | blob | history
merge2.c diff | blob | history
vpatch.c diff | blob | history
wiggle.1 diff | blob | history
wiggle.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs