connect: teach client to recognize v1 server response

diff --git a/merge-recursive.c b/merge-recursive.c
index 35af3761baf61c523b27c64e6b7e5cf3c55adb26..1d3f8f0d22157e11c1e0db6f230e39240d2f3e63 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1951,7 +1951,7 @@ int merge_trees(struct merge_options *o,
        }
 
        if (oid_eq(&common->object.oid, &merge->object.oid)) {
-               output(o, 0, _("Already up-to-date!"));
+               output(o, 0, _("Already up to date!"));
                *result = head;
                return 1;
        }