From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Nov 2017 10:52:59 +0000 (+1100)
Subject: merg_msg: don't launch gvim for now
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=4a10f69ae4992c416dd41ab05ecf9bc0fd40e6d0;p=next-scripts

merg_msg: don't launch gvim for now
---

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"