]> git.neil.brown.name Git - wiggle.git/commitdiff
vpatch: fix browse of three-file merge.
authorNeilBrown <neilb@suse.de>
Wed, 20 Feb 2013 04:19:42 +0000 (15:19 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 20 Feb 2013 04:19:42 +0000 (15:19 +1100)
Due to a flag problem, it was ignoring the second and third files.

Signed-off-by: NeilBrown <neilb@suse.de>
vpatch.c

index 3a30be30f63d311517266e950d7f136b01df025c..a5e6eb58411ec4e8aa6a4ccc855f87e738f66d6f 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -2964,7 +2964,7 @@ int vpatch(int argc, char *argv[], int patch, int strip,
                           replace, selftest);
                break;
        case 3: /* orig, before, after */
-               show_merge(argv[0], NULL, reverse, 1, argv[1], argv[2],
+               show_merge(argv[0], NULL, reverse, 0, argv[1], argv[2],
                           replace, selftest);
                break;
        }