git checkout -b: allow switching out of an unborn branch

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index eeefb9c29946fc748e6278d571e7c07e67e144bc..a79a2ecd49411f30517943108851243afa64de7b 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -38,7 +38,7 @@ check_unchanged () {
                while true; do
                        echo "$MERGED seems unchanged."
                        printf "Was the merge successful? [y/n] "
-                       read answer
+                       read answer || return 1
                        case "$answer" in
                        y*|Y*) status=0; break ;;
                        n*|N*) status=1; break ;;
@@ -187,7 +187,7 @@ run_merge_tool () {
                        fi
                        check_unchanged
                else
-                       "$merge_tool_path" -f -d -c "wincmd l" \
+                       "$merge_tool_path" -R -f -d -c "wincmd l" \
                                "$LOCAL" "$REMOTE"
                fi
                ;;
@@ -198,7 +198,7 @@ run_merge_tool () {
                                "$LOCAL" "$MERGED" "$REMOTE"
                        check_unchanged
                else
-                       "$merge_tool_path" -f -d -c "wincmd l" \
+                       "$merge_tool_path" -R -f -d -c "wincmd l" \
                                "$LOCAL" "$REMOTE"
                fi
                ;;
@@ -258,12 +258,9 @@ run_merge_tool () {
                ;;
        p4merge)
                if merge_mode; then
-                   touch "$BACKUP"
-                       if $base_present; then
-                               "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
-                       else
-                               "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
-                       fi
+                       touch "$BACKUP"
+                       $base_present || >"$BASE"
+                       "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
                        check_unchanged
                else
                        "$merge_tool_path" "$LOCAL" "$REMOTE"