summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 10:29:08 -0800
commit3cc3cf970c5ce477bde78df73614d1efba2b52eb (patch)
tree2bcc9526ccf586db926050ee6e01fe2e2e418982 /merge-recursive.c
parentMerge branch 'mg/bisect-doc' (diff)
parentAdd utf8_fprintf helper that returns correct number of columns (diff)
downloadtgif-3cc3cf970c5ce477bde78df73614d1efba2b52eb.tar.xz
Merge branch 'jx/utf8-printf-width'
Use a new helper that prints a message and counts its display width to align the help messages parse-options produces. * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions