aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-06 01:50:02 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-06 01:50:02 -0800
commit8f321a39257a06db014a3b6ae5dce839821cdb16 (patch)
treebdae79f6e99d8db7ded12228cec8b3fe37d9ad9f /git-mergetool.sh
parent5715d0bb60dd90b03519cc436310f3cabe5b9b2a (diff)
downloadgit-8f321a39257a06db014a3b6ae5dce839821cdb16.tar.gz
git-8f321a39257a06db014a3b6ae5dce839821cdb16.tar.xz
scripts: Add placeholders for OPTIONS_SPEC
--text follows this line-- These commands currently lack OPTIONS_SPEC; allow people to easily list with "git grep 'OPTIONS_SPEC=$'" what they can help improving. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh1
1 files changed, 1 insertions, 0 deletions
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)