Merge branch 'mz/maint-rename-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700)
* mz/maint-rename-unmerged:
  diffcore-rename: don't consider unmerged path as source

1  2 
diffcore-rename.c
t/t7060-wtstatus.sh

Simple merge
Simple merge