Merge branch 'maint'
commit2570458fdaeb577eb60e470bee0f7065dd2058b8
authorJunio C Hamano <junkio@cox.net>
Wed, 29 Nov 2006 06:32:41 +0000 (28 22:32 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 29 Nov 2006 06:32:41 +0000 (28 22:32 -0800)
tree9bd2e4fd3770e44086d4e0fcb35a07bb57bdf9df
parent1ca7558dd838e82f6f6b8611b981654fa4ecde2b
parentab3bb800b46cf66249ead9e13c22cbc48d790c9a
Merge branch 'maint'

* maint:
  git blame -C: fix output format tweaks when crossing file boundary.