Merge branch 'jn/maint-notes-avoid-va-args' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:11:50 +0000 (11:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Nov 2011 19:11:50 +0000 (11:11 -0800)
* jn/maint-notes-avoid-va-args:
notes merge: eliminate OUTPUT macro

Conflicts:
notes-merge.c

No differences found