]> git.ozlabs.org Git - next-scripts/commitdiff
merge_msg: suppress gtk warning messages from gvim
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Jul 2014 04:35:33 +0000 (14:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Jul 2014 04:35:33 +0000 (14:35 +1000)
merge_msg

index 5b63b64c1e5e4fa010d9bad45812d45fac1a8342..f5dc1d497f0c00113ecf9e4cc79aacdb9d89c4e9 100755 (executable)
--- 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 ] && {