diff options
| -rwxr-xr-x | git-mergetool.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 0ff6566a0e..8098d2dc07 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -10,11 +10,11 @@ USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...' SUBDIRECTORY_OK=Yes +NONGIT_OK=Yes OPTIONS_SPEC= TOOL_MODE=merge . git-sh-setup . git-mergetool--lib -require_work_tree # Returns true if the mode reflects a symlink is_symlink () { @@ -377,6 +377,9 @@ prompt_after_failed_merge () { done } +git_dir_init +require_work_tree + if test -z "$merge_tool" then merge_tool=$(get_merge_tool "$merge_tool") || exit |