From e2161bc38514722050b3a9c50a7897c40b6a93cf Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Thu, 9 May 2013 02:13:28 -0700
Subject: mergetools/kdiff3: do not use --auto when diffing

The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto-
solvable."  This flag was carried over from the original mergetool
commands.  diff_cmd() is for two-way comparisons only so remove the
superfluous flag.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 mergetools/kdiff3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mergetools')

diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 28fead428b..a30034f116 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -1,5 +1,5 @@
 diff_cmd () {
-	"$merge_tool_path" --auto \
+	"$merge_tool_path" \
 		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
 		"$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
-- 
cgit v1.2.3