mergetools/kdiff3: do not use --auto when diffing

davvid · gitster · commit e2161bc38514 · 2013-05-09T11:59:39.000-07:00
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 &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`diff_cmd () {`
`2`		`- "$merge_tool_path" --auto \`
	`2`	`+ "$merge_tool_path" \`
`3`	`3`	`--L1 "$MERGED (A)" --L2 "$MERGED (B)" \`
`4`	`4`	`"$LOCAL" "$REMOTE" >/dev/null 2>&1`
`5`	`5`	`}`