merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh
index e83315f0e31af1e89207557136aee6d40604e66f..6d2f282d32212b605a1237bae224ecbba05cacd1 100755 (executable)
--- a/git-remote-testgit.sh
+++ b/git-remote-testgit.sh
@@ -38,6 +38,7 @@ do
                        echo "*export-marks $gitmarks"
                fi
                test -n "$GIT_REMOTE_TESTGIT_SIGNED_TAGS" && echo "signed-tags"
+               test -n "$GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE" && echo "no-private-update"
                echo
                ;;
        list)
@@ -104,7 +105,12 @@ do
                        *" $ref $a "*)
                                continue ;;     # unchanged
                        esac
-                       echo "ok $ref"
+                       if test -z "$GIT_REMOTE_TESTGIT_PUSH_ERROR"
+                       then
+                               echo "ok $ref"
+                       else
+                               echo "error $ref $GIT_REMOTE_TESTGIT_PUSH_ERROR"
+                       fi
                done
 
                echo