summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:23 -0800
commit393b7c3cd7c87a42e2e477de38d4a6e4981db8bb (patch)
tree144d3a57d03ad1ff416e9d2e3fc4dac6e30132bb /builtin/merge-recursive.c
parentMerge branch 'jx/utf8-printf-width' (diff)
parentUse __VA_ARGS__ for all of error's arguments (diff)
downloadtgif-393b7c3cd7c87a42e2e477de38d4a6e4981db8bb.tar.xz
Merge branch 'jk/error-const-return'
* jk/error-const-return: Use __VA_ARGS__ for all of error's arguments
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions