From: David Aguilar <davvid@gmail.com>
To: gitster@pobox.com
Cc: charles@hashpling.org, markus.heidelberg@web.de,
git@vger.kernel.org, David Aguilar <davvid@gmail.com>
Subject: [PATCH] mergetool-lib: specialize opendiff options when in diff mode
Date: Thu, 2 Apr 2009 19:16:11 -0700 [thread overview]
Message-ID: <1238724971-60979-1-git-send-email-davvid@gmail.com> (raw)
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
reply other threads:[~2009-04-03 2:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1238724971-60979-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).