Merge branch 'mz/maint-rename-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:27 +0000 (15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:27 +0000 (15:58 -0700)
commit2db8926236406a4e4cb17d1b9c4b791706fb0512
tree2156bd237ac11f679bbc3bb9e085cae81d12e441
parent791a765e54b9b4c8d2cf4f069222e31cef8aa24e
parentd7c9bf22351e39756f93f09b4251a6b5861d9cc0
Merge branch 'mz/maint-rename-unmerged'

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