![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2011 22:58:27 +0000 (15:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2011 22:58:27 +0000 (15:58 -0700) | ||
| commit | 2db8926236406a4e4cb17d1b9c4b791706fb0512 | |
| tree | 2156bd237ac11f679bbc3bb9e085cae81d12e441 | tree | snapshot |
| parent | 791a765e54b9b4c8d2cf4f069222e31cef8aa24e | commit | diff |
| parent | d7c9bf22351e39756f93f09b4251a6b5861d9cc0 | commit | diff |
Merge branch 'mz/maint-rename-unmerged'
* mz/maint-rename-unmerged:
diffcore-rename: don't consider unmerged path as source
* mz/maint-rename-unmerged:
diffcore-rename: don't consider unmerged path as source
| diffcore-rename.c | diff1 | | diff2 | | blob | history |
| t/t7060-wtstatus.sh | diff1 | | diff2 | | blob | history |