Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 6 Apr 2006 01:22:19 +0000 (18:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 6 Apr 2006 01:22:19 +0000 (18:22 -0700)
commit2db70f684ad67f088dde17967290ee2733b588ad
tree0f3d7c2e5c2badf537604f5ca5decb3cb87d2f86
parent9cda21defb0ad18f50b4dcea9f027f75a15131fd
parentba3c93743a8151e3663e1fda6b3cb165d8373ddf
Merge branch 'master' into next

* master:
  blame.c: fix completely broken ancestry traversal.
blame.c