Sync with master

diff --git a/notes-merge.c b/notes-merge.c
index 744c68557649ff1b1fbc007cd2bd2951fc09ab93..b04d2f213116a6413d564107a6e12e3f7317accb 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -624,7 +624,7 @@ int notes_merge(struct notes_merge_options *o,
        if (!oidcmp(&remote->object.oid, base_oid)) {
                /* Already merged; result == local commit */
                if (o->verbosity >= 2)
-                       printf("Already up-to-date!\n");
+                       printf("Already up to date!\n");
                oidcpy(result_oid, &local->object.oid);
                goto found_result;
        }