Merge branch 'jc/maint-blame-unique-abbrev'
commit3a335ee2da090e435bd771df56860496b570decc
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 16:01:37 +0000 (9 09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 16:01:38 +0000 (9 09:01 -0700)
tree8b142f0364cdca968960db0e757f26f9fa56db34
parentcd0c96a9e33b1c5e8b1b9f1219994b2c67fa396b
parentb31272f704d03258a90b0e83e0f5c8df5c038ae6
Merge branch 'jc/maint-blame-unique-abbrev'

"git blame" did not try to make sure the abbreviated commit object
names in its output are unique.

* jc/maint-blame-unique-abbrev:
  blame: compute abbreviation width that ensures uniqueness
builtin/blame.c