Merge branch 'jx/branch-vv-always-compare-with-upstream'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 20:24:49 +0000 (12:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 20:24:49 +0000 (12:24 -0800)
commitab930f02961bd4cce9b3dd5049c6eabd07ca03a8
tree773140cf2f2ebbf83436f0957104a9a248b16854
parent03973056a08d1694cf1c819eb2e8b9557650f70e
parent6b364d48f2e72d6c37115e6aa4fe769a523dd1d4
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
builtin/branch.c