![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700) | ||
| commit | 4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0 | |
| tree | dc900dc97023bbdaef3241548d063c49a2332589 | tree | snapshot |
| parent | ebe8621fd798a568ae33eb6a665cb3c758dd3816 | commit | diff |
| parent | d7c9bf22351e39756f93f09b4251a6b5861d9cc0 | commit | diff |
Merge branch 'mz/maint-rename-unmerged' into maint
* 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 |