bash-completion: Add comments to remind about required arguments

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5144971647c177533bfe6cdd1be974bd60555728..b2d53752ae49ff2c8323836e2907de584cb1e979 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -269,6 +269,11 @@ merge_file () {
     if test "$status" -ne 0; then
        echo "merge of $MERGED failed" 1>&2
        mv -- "$BACKUP" "$MERGED"
+
+       if test "$merge_keep_temporaries" = "false"; then
+           cleanup_temp_files
+       fi
+
        return 1
     fi
 
@@ -307,6 +312,7 @@ do
            prompt=true
            ;;
        --)
+           shift
            break
            ;;
        -*)
@@ -415,6 +421,7 @@ else
     init_merge_tool_path "$merge_tool"
 
     merge_keep_backup="$(git config --bool merge.keepBackup || echo true)"
+    merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
 
     if test -z "$merge_tool_cmd" && ! type "$merge_tool_path" > /dev/null 2>&1; then
         echo "The merge tool $merge_tool is not available as '$merge_tool_path'"