Merge branch 'zj/decimal-width'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:11 +0000 (00:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Feb 2012 08:15:11 +0000 (00:15 -0800)
commit4d9e079e826c9b51b610260564111fa8385f7581
tree13a4e3a16efd510b3b15a2ce55cf3caeb00857aa
parent583c389e7e431583de4fd8f6c06495a9b015c528
parentec7ff5ba272b565ed093a98dc13dd5cd26aeac92
Merge branch 'zj/decimal-width'

* zj/decimal-width:
  make lineno_width() from blame reusable for others

Conflicts:
cache.h
pager.c
builtin/blame.c
cache.h
pager.c