From 9e5ee390674f3d0eb5da5eed31cbd89270027aa3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 30 Jul 2008 06:03:48 +0200
Subject: [PATCH] fixes (merge continuation sh -> bash)

---
 git-test-merge | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/git-test-merge b/git-test-merge
index bfdaee7..fe81ebf 100755
--- a/git-test-merge
+++ b/git-test-merge
@@ -37,12 +37,12 @@ submerge(){
       while read -er f; do
         echo -n "checking $f .. "
         if conflicted "$f"; then
+          echo "resolved"
+          git add "$f"
+        else
           echo -e "\n >>    \`$f' contains unresolved conflicts"
           echo "$name" > "$cont"; echo "$@" >> "$cont"
           conflicted=1
-        else
-          echo "resolved"
-          git add "$f"
         fi
         [ -n "$conflicted" ] && { 
           echo "resolve conflicts, run   $me c to continue"
@@ -67,7 +67,7 @@ gittestmerge(){
         conflicted "$f" || { echo " \`$f' still contains conflicts, resolve them and continue, exiting"; failmessage=; exit 1; }
         git add "$f" >> "$tmp" 2>&1
       done < <( git status | sed -n 's/#\s*unmerged:\s*\(.*\)/\1/p' )
-      cat $cont | { read name; read x; set $x --; }
+      { read name; read x; set -- $x; } < $cont
       submerge "$@"
     ;;
     u|update) shift
-- 
2.11.4.GIT