[PATCH 1/3] mergetools/kdiff3: do not use --auto when diffing
- From
David Aguilar <davvid@gmail.com>
- Date
- May 9, 2013, 09:13 UTC
- Message-ID
- <1368090810-40596-1-git-send-email-davvid@gmail.com>
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> --- This one is not RFC; just a trivial fix.
mergetools/kdiff3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 28fead4..a30034f 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 }
-- 1.8.3.rc1.38.g0f1704c