From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Jul 2014 04:35:33 +0000 (+1000)
Subject: merge_msg: suppress gtk warning messages from gvim
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=9829bb7c8f7819e00586b6e1380576431bbdbbea;p=next-scripts

merge_msg: suppress gtk warning messages from gvim
---

diff --git a/merge_msg b/merge_msg
index 5b63b64..f5dc1d4 100755
--- a/merge_msg
+++ b/merge_msg
@@ -9,7 +9,7 @@ branch=""
 file="$*"
 
 gitk --merge -- $file &
-[ "$file" ] && gvim $file
+[ "$file" ] && gvim $file 2>/dev/null
 
 conf="a conflict"
 [ "$#" -gt 1 ] && {