Merge branch 'mp/complete-paths'

diff --git a/notes-merge.c b/notes-merge.c
index 7d62904f619fcd775f7ed7e7cff00d44005f3a5b..0f67bd3f9605aa7a3c98b88b4ae4aae037ace3d7 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -522,8 +522,10 @@ static int merge_from_diffs(struct notes_merge_options *o,
        free(changes);
 
        if (o->verbosity >= 4)
-               printf("Merge result: %i unmerged notes and a %s notes tree\n",
-                       conflicts, t->dirty ? "dirty" : "clean");
+               printf(t->dirty ?
+                      "Merge result: %i unmerged notes and a dirty notes tree\n" :
+                      "Merge result: %i unmerged notes and a clean notes tree\n",
+                      conflicts);
 
        return conflicts ? -1 : 1;
 }