From: Caleb Cushing Date: Wed, 28 Jan 2009 06:56:47 GMT Subject: [PATCH] mergetool merge/skip/abort at prompt Message-ID: <81bfc67a0901272256t726bf206k351bb6c8b2778bd5@mail.gmail.com> previously git mergetool when run with prompt only allowed the user to continue merging. This changes git mergetool to allow the option of skipping a file or aborting, and includes an addtional key to explicitly select merge. Signed-off-by: Caleb Cushing --- git-mergetool.sh | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 00e1337..575fbb2 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -177,8 +177,24 @@ merge_file () { describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" if "$prompt" = true; then - printf "Hit return to start merge resolution tool (%s): " "$merge_tool" - read ans + while true; do + printf "Use (m)erge file or (s)kip file, or (a)bort? (%s): " \ + "$merge_tool" + read ans + case "$ans" in + [mM]*|"") + break + ;; + [sS]*) + cleanup_temp_files + return 0 + ;; + [aA]*) + cleanup_temp_files + exit 0 + ;; + esac + done fi case "$merge_tool" in -- 1.6.1.1