git-read-tree: fix up two-way merge

diff --git a/git-status-script b/git-status-script
index 72a93f74e8152417578f4c250852450a61bd8440..f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd 100755 (executable)
--- a/git-status-script
+++ b/git-status-script
@@ -13,13 +13,13 @@ report () {
     trailer="#
 "
     case "$status" in
-    M) echo "# modified: $name";;
-    D) echo "# deleted:  $name";;
-    T) echo "# typechange: $name";;
-    C) echo "# copied: $name -> $newname";;
-    R) echo "# renamed: $name -> $newname";;
-    N) echo "# new file: $name";;
-    U) echo "# unmerged: $name";;
+    M ) echo "#        modified: $name";;
+    D*) echo "#        deleted:  $name";;
+    T ) echo "#        typechange: $name";;
+    C*) echo "#        copied: $name -> $newname";;
+    R*) echo "#        renamed: $name -> $newname";;
+    N*) echo "#        new file: $name";;
+    U ) echo "#        unmerged: $name";;
     esac
   done
   echo -n "$trailer"