From: NeilBrown <neilb@suse.de>
Date: Wed, 20 Feb 2013 04:19:42 +0000 (+1100)
Subject: vpatch: fix browse of three-file merge.
X-Git-Tag: v1.0~57
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=0c4847dccb6f0507e7113f2ddbe2732c6c46a46c;p=wiggle.git

vpatch: fix browse of three-file merge.

Due to a flag problem, it was ignoring the second and third files.

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

diff --git a/vpatch.c b/vpatch.c
index 3a30be3..a5e6eb5 100644
--- 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;
 	}