git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool
@ 2013-01-24  7:16 Alexey Shumkin
  2013-01-24  7:16 ` [PATCH 2/3] mergetool--lib: Add diffuse as a tool Alexey Shumkin
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Alexey Shumkin @ 2013-01-24  7:16 UTC (permalink / raw)
  To: git; +Cc: Pat Thoyts, Alexey Shumkin, Junio C Hamano

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-01-25  8:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-24  7:16 [PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool Alexey Shumkin
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

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).