aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-05-09 02:13:28 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-09 11:59:39 -0700
commite2161bc38514722050b3a9c50a7897c40b6a93cf (patch)
tree49ff21667b4712a5ac27e567b95c8aaf6b1c2566 /mergetools
parentb120ef3eac677762427631d5ae7372402a80b837 (diff)
downloadgit-e2161bc38514722050b3a9c50a7897c40b6a93cf.tar.gz
git-e2161bc38514722050b3a9c50a7897c40b6a93cf.tar.xz
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>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/kdiff32
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 28fead428..a30034f11 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
}