Replace a pair of patches with updated ones for subproject support.

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 1355fcb19f8120fffef3009a2fdc6534ef14e4cc..e62351bcbabc00a3d89ddf1c8dd936cea400501f 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -44,25 +44,24 @@ describe_file () {
     branch="$2"
     file="$3"
 
-    printf "    "
+    printf "  {%s}: " "$branch"
     if test -z "$mode"; then
-       printf "'%s' was deleted" "$path"
+       echo "deleted"
     elif is_symlink "$mode" ; then
-       printf "'%s' is a symlink containing '%s'" "$path" "$file"
+       echo "a symbolic link -> '$(cat "$file")'"
     else
        if base_present; then
-           printf "'%s' was created" "$path"
+           echo "modified"
        else
-           printf "'%s' was modified" "$path"
+           echo "created"
        fi
     fi
-    echo " in the $branch branch"
 }
 
 
 resolve_symlink_merge () {
     while true; do
-       printf "Use (r)emote or (l)ocal, or (a)bort? "
+       printf "Use (l)ocal or (r)emote, or (a)bort? "
        read ans
        case "$ans" in
            [lL]*)
@@ -71,13 +70,13 @@ resolve_symlink_merge () {
                cleanup_temp_files --save-backup
                return
                ;;
-          [rR]*)
+           [rR]*)
                git-checkout-index -f --stage=3 -- "$path"
                git-add -- "$path"
                cleanup_temp_files --save-backup
                return
                ;;
-           [qQ]*)
+           [aA]*)
                exit 1
                ;;
            esac
@@ -86,20 +85,24 @@ resolve_symlink_merge () {
 
 resolve_deleted_merge () {
     while true; do
-       printf "Use (m)odified or (d)eleted file, or (a)bort? "
+       if base_present; then
+           printf "Use (m)odified or (d)eleted file, or (a)bort? "
+       else
+           printf "Use (c)reated or (d)eleted file, or (a)bort? "
+       fi
        read ans
        case "$ans" in
-           [mM]*)
+           [mMcC]*)
                git-add -- "$path"
                cleanup_temp_files --save-backup
                return
                ;;
-          [dD]*)
-               git-rm -- "$path"
+           [dD]*)
+               git-rm -- "$path" > /dev/null
                cleanup_temp_files
                return
                ;;
-           [qQ]*)
+           [aA]*)
                exit 1
                ;;
            esac
@@ -164,7 +167,7 @@ merge_file () {
     remote_present && git cat-file blob ":3:$path" > "$REMOTE" 2>/dev/null
 
     if test -z "$local_mode" -o -z "$remote_mode"; then
-       echo "Deleted merge conflict for $path:"
+       echo "Deleted merge conflict for '$path':"
        describe_file "$local_mode" "local" "$LOCAL"
        describe_file "$remote_mode" "remote" "$REMOTE"
        resolve_deleted_merge
@@ -172,14 +175,14 @@ merge_file () {
     fi
 
     if is_symlink "$local_mode" || is_symlink "$remote_mode"; then
-       echo "Symlink merge conflict for $path:"
+       echo "Symbolic link merge conflict for '$path':"
        describe_file "$local_mode" "local" "$LOCAL"
        describe_file "$remote_mode" "remote" "$REMOTE"
        resolve_symlink_merge
        return
     fi
 
-    echo "Normal merge conflict for $path:"
+    echo "Normal merge conflict for '$path':"
     describe_file "$local_mode" "local" "$LOCAL"
     describe_file "$remote_mode" "remote" "$REMOTE"
     printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
@@ -230,6 +233,16 @@ merge_file () {
            check_unchanged
            save_backup
            ;;
+       opendiff)
+           touch "$BACKUP"
+           if base_present; then
+               opendiff "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat
+           else
+               opendiff "$LOCAL" "$REMOTE" -merge "$path" | cat
+           fi
+           check_unchanged
+           save_backup
+           ;;
        emerge)
            if base_present ; then
                emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$path"
@@ -280,7 +293,7 @@ done
 if test -z "$merge_tool"; then
     merge_tool=`git-config merge.tool`
     case "$merge_tool" in
-       kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff)
+       kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "")
            ;; # happy
        *)
            echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
@@ -299,6 +312,8 @@ if test -z "$merge_tool" ; then
        merge_tool=xxdiff
     elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then
        merge_tool=meld
+    elif type opendiff >/dev/null 2>&1; then
+       merge_tool=opendiff
     elif type emacs >/dev/null 2>&1; then
        merge_tool=emerge
     elif type vimdiff >/dev/null 2>&1; then
@@ -310,7 +325,7 @@ if test -z "$merge_tool" ; then
 fi
 
 case "$merge_tool" in
-    kdiff3|tkdiff|meld|xxdiff|vimdiff)
+    kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff)
        if ! type "$merge_tool" > /dev/null 2>&1; then
            echo "The merge tool $merge_tool is not available"
            exit 1