Code

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)
commit01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64
tree6d7a2ad116b12ad674c1e146d854dce56c99076d
parent487da9cdf4fc4e3735cede5a31c2ac7be18b50b2
parent5f9f8d15f176a02cc66531cf5b5f749bec068961
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
notes-merge.c