From: Alexey Shumkin <alex.crezoff@gmail.com>
To: git@vger.kernel.org
Cc: Pat Thoyts <patthoyts@users.sourceforge.net>,
Alexey Shumkin <Alex.Crezoff@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool
Date: Thu, 24 Jan 2013 11:16:06 +0400 [thread overview]
Message-ID: <1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com> (raw)
Options are taken from <Git source>/mergetools/vim
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
---
git-gui/lib/mergetool.tcl | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 3c8e73b..4fc1cab 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -211,7 +211,13 @@ proc merge_resolve_tool2 {} {
}
}
gvimdiff {
- set cmdline [list "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"]
+ if {$base_stage ne {}} {
+ set cmdline [list "$merge_tool_path" -f -d -c "wincmd J" \
+ "$MERGED" "$LOCAL" "$BASE" "$REMOTE"]
+ } else {
+ set cmdline [list "$merge_tool_path" -f -d -c "wincmd l" \
+ "$LOCAL" "$MERGED" "$REMOTE"]
+ }
}
kdiff3 {
if {$base_stage ne {}} {
--
1.8.1.1.10.g9255f3f
next reply other threads:[~2013-01-24 7:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 7:16 Alexey Shumkin [this message]
2013-01-24 7:16 ` [PATCH 2/3] mergetool--lib: Add diffuse as a tool Alexey Shumkin
2013-01-24 7:16 ` [PATCH 3/3] mergetool--lib: Add TortoiseMerge " Alexey Shumkin
2013-01-25 5:07 ` [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool David Aguilar
2013-01-25 8:44 ` Alexey Shumkin
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=1359011768-7665-1-git-send-email-Alex.Crezoff@gmail.com \
--to=alex.crezoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=patthoyts@users.sourceforge.net \
/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).