Merge branch 'jx/branch-vv-always-compare-with-upstream'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 20:24:49 +0000 (18 12:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Nov 2013 20:24:49 +0000 (18 12:24 -0800)
Hot-fix for a regression.

* jx/branch-vv-always-compare-with-upstream:
  branch: fix --verbose output column alignment

1  2 
builtin/branch.c

Simple merge