diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:11:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:11:50 -0800 |
commit | 01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64 (patch) | |
tree | 6d7a2ad116b12ad674c1e146d854dce56c99076d /t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master | |
parent | Makefile: add missing header file dependencies (diff) | |
parent | notes merge: eliminate OUTPUT macro (diff) | |
download | tgif-01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64.tar.xz |
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
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master')
0 files changed, 0 insertions, 0 deletions