summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:10:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-07 11:10:02 -0700
commit8023a422107ca5075eb285f7a9358778db66c616 (patch)
treed3238f456914948b3be699a2742b640660e34faf /merge-recursive.c
parentMerge branch 'jk/maint-http-half-auth-push' (diff)
parentbranch -v: align even when branch names are in UTF-8 (diff)
downloadtgif-8023a422107ca5075eb285f7a9358778db66c616.tar.xz
Merge branch 'nd/branch-v-alignment'
Output from "git branch -v" contains "(no branch)" that could be localized, but the code to align it along with the names of branches were counting in bytes, not in display columns. * nd/branch-v-alignment: branch -v: align even when branch names are in UTF-8
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions