Merge branch 'mz/maint-rename-unmerged' into maint

* mz/maint-rename-unmerged: diffcore-rename: don't consider unmerged path as source

Junio C Hamano committed May 13, 2011 at 10:41 UTC 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0

No changes.