[PATCH] mergetool-lib: specialize opendiff options when in diff mode

From

David Aguilar <davvid@gmail.com>

Date

Apr 3, 2009, 02:16 UTC

Message-ID

<1238724971-60979-1-git-send-email-davvid@gmail.com>

We don't need the '-merged "$MERGED"' option when in diff mode.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 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