summaryrefslogtreecommitdiff
path: root/mergetools/kompare
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-11-18 12:24:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-18 12:24:49 -0800
commitab930f02961bd4cce9b3dd5049c6eabd07ca03a8 (patch)
tree773140cf2f2ebbf83436f0957104a9a248b16854 /mergetools/kompare
parentGit 1.8.5-rc2 (diff)
parentbranch: fix --verbose output column alignment (diff)
downloadtgif-ab930f02961bd4cce9b3dd5049c6eabd07ca03a8.tar.xz
Merge branch 'jx/branch-vv-always-compare-with-upstream'
Hot-fix for a regression. * jx/branch-vv-always-compare-with-upstream: branch: fix --verbose output column alignment
Diffstat (limited to 'mergetools/kompare')
0 files changed, 0 insertions, 0 deletions