From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:41:24 +0000 (-0700)
Subject: Merge branch 'mz/maint-rename-unmerged' into maint
X-Git-Tag: v1.7.5.2~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0?hp=--cc

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

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

4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0