Merge branch 'mz/maint-rename-unmerged' into maint
commit4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (13 10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (13 10:41 -0700)
treedc900dc97023bbdaef3241548d063c49a2332589
parentebe8621fd798a568ae33eb6a665cb3c758dd3816
parentd7c9bf22351e39756f93f09b4251a6b5861d9cc0
Merge branch 'mz/maint-rename-unmerged' into maint

* mz/maint-rename-unmerged:
  diffcore-rename: don't consider unmerged path as source
diffcore-rename.c
t/t7060-wtstatus.sh