Merge branch 'rs/diff'
commit71e55854fd6e5c9ce786bcd20efef43bd56f9df0
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 21:58:09 +0000 (1 14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Jul 2007 21:58:09 +0000 (1 14:58 -0700)
tree5adf301168c9c10ae952dd5de29b9edd8104c99e
parent660d579d6ff0ac29b8f7b38b3da73f09214d39aa
parent125b7630521918b75c136bd95309054d3f6d9da5
Merge branch 'rs/diff'

* rs/diff:
  diff: round down similarity index
  diffcore-rename: don't change similarity index based on basename equality