Merge branch 'jc/diff' into next
commitcf1e6d1ec55264272be8b7f0c276a069d2aac69a
authorJunio C Hamano <junkio@cox.net>
Mon, 13 Mar 2006 07:45:42 +0000 (12 23:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 13 Mar 2006 07:45:42 +0000 (12 23:45 -0800)
tree5a9164a2313511b70cbc749343d375884201a325
parent2593a410e095f89f0eef40edb90b39029574462b
parent90bd932c811f4ecd1d8cbceffdf6a69a5ca838b7
Merge branch 'jc/diff' into next

* jc/diff:
  Fix up diffcore-rename scoring