Merge branch 'jn/maint-notes-avoid-va-args' into maint

* jn/maint-notes-avoid-va-args:
notes merge: eliminate OUTPUT macro

Conflicts:
notes-merge.c

diff --cc notes-merge.c
index baaf31f4aed4e4cfd967c278b7cfd4bee6a0ab30,ec02da1329c7ed5d792ee358ce838ec869f8cb7f..d0e5034da4991777bad8e0a42a45801e0e785b7d
--- 1/notes-merge.c
--- 2/notes-merge.c
+++ b/notes-merge.c
@@@ -718,9 -734,9 +734,10 @@@ int notes_merge_commit(struct notes_mer
  
        create_notes_commit(partial_tree, partial_commit->parents, msg,
                            result_sha1);
-       OUTPUT(o, 4, "Finalized notes merge commit: %s",
-              sha1_to_hex(result_sha1));
+       if (o->verbosity >= 4)
+               printf("Finalized notes merge commit: %s\n",
+                       sha1_to_hex(result_sha1));
 +      free(path);
        return 0;
  }