[PATCH] mergetool-lib: specialize opendiff options when in diff mode
From: David Aguilar <hidden>
Date: 2016-06-15 22:46:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
We don't need the '-merged "$MERGED"' option when in diff mode. Signed-off-by: David Aguilar <redacted> --- git-mergetool--lib.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 06d261a..b8566b2 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh@@ -189,8 +189,12 @@ run_mergetool () { "$merge_tool_path" "$LOCAL" "$REMOTE" \ -ancestor "$BASE" -merge "$MERGED" | cat else - "$merge_tool_path" "$LOCAL" "$REMOTE" \ - -merge "$MERGED" | cat + if merge_mode; then + "$merge_tool_path" "$LOCAL" "$REMOTE" \ + -merge "$MERGED" | cat + else + "$merge_tool_path" "$LOCAL" "$REMOTE" | cat + fi fi check_unchanged ;;
--
1.6.1.3