]> git.ozlabs.org Git - next-scripts/commitdiff
merg_msg: don't launch gvim for now
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 23 Nov 2017 10:52:59 +0000 (21:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 23 Nov 2017 10:52:59 +0000 (21:52 +1100)
merge_msg

index a9695fac89d24bcbdf0ba8c8fed552a40b93e5d0..38e6e2e6113d3494806c5163e24009a946c097b3 100755 (executable)
--- 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"