From 9829bb7c8f7819e00586b6e1380576431bbdbbea Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Jul 2014 14:35:33 +1000
Subject: [PATCH] merge_msg: suppress gtk warning messages from gvim

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

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 ] && {
-- 
2.39.2