Merge branch 'jc/maint-blame-unique-abbrev' into maint
commitb700086d840ceaee339f9f031be72b34e237f84f
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:58:28 +0000 (11 12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:58:28 +0000 (11 12:58 -0700)
treebe4ce2ab92e59f202f13785cd3d49d472bd72f88
parent2e1e8efcc7ec25c8253d56a9b259e711290b3572
parentb31272f704d03258a90b0e83e0f5c8df5c038ae6
Merge branch 'jc/maint-blame-unique-abbrev' into maint

"git blame" did not try to make sure that 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