![[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) |
* mz/maint-rename-unmerged:
diffcore-rename: don't consider unmerged path as source
diffcore-rename: don't consider unmerged path as source
| 1 | 2 | |||
|---|---|---|---|---|
| diffcore-rename.c | patch | | diff1 | | diff2 | | blob | history |
| t/t7060-wtstatus.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc diffcore-rename.c
Simple merge
diff --cc t/t7060-wtstatus.sh
Simple merge