From 4a10f69ae4992c416dd41ab05ecf9bc0fd40e6d0 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Nov 2017 21:52:59 +1100
Subject: [PATCH] merg_msg: don't launch gvim for now

---
 merge_msg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_msg b/merge_msg
index a9695fa..38e6e2e 100755
--- a/merge_msg
+++ b/merge_msg
@@ -7,7 +7,7 @@ branch=""
 }
 
 gitk --merge -- "$@" &
-[ "$#" ] && gvim "$@" 2>/dev/null
+# [ "$#" ] && gvim "$@" 2>/dev/null
 
 printf -v files "  %s\n" "$@"
 conf="a conflict"
-- 
2.39.2