X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool.sh;h=5587c5ecea0f6a97f2715636890c9e2f89845d52;hb=d9f405931fa3d96b2a80fe5ad8205eea7c443f56;hp=a68b40386bde1c47c33a19514ec3a22db7fb0e4b;hpb=43f36901c5e4d54de2c3b7c5d62af59382df717c;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index a68b40386..5587c5ece 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -10,6 +10,7 @@
 
 USAGE='[--tool=tool] [file to merge] ...'
 SUBDIRECTORY_OK=Yes
+OPTIONS_SPEC=
 . git-sh-setup
 require_work_tree
 prefix=$(git rev-parse --show-prefix)