* [PATCH] mergetool-lib: specialize opendiff options when in diff mode
@ 2009-04-03 2:16 David Aguilar
0 siblings, 0 replies; only message in thread
From: David Aguilar @ 2009-04-03 2:16 UTC (permalink / raw)
To: gitster; +Cc: charles, markus.heidelberg, git, David Aguilar
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-03 2:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-03 2:16 [PATCH] mergetool-lib: specialize opendiff options when in diff mode David Aguilar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).