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>
David Aguilar committed
May 9, 2013 at 02:13 UTC
e2161bc38514722050b3a9c50a7897c40b6a93cf
1 file changed
+1
-1
mergetools/kdiff3
+1
-1
@@ -1,5 +1,5 @@
1
diff_cmd () {
2
- "$merge_tool_path" --auto \
2
+ "$merge_tool_path" \
3
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
4
"$LOCAL" "$REMOTE" >/dev/null 2>&1
5
}