![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Sep 2010 19:39:12 +0000 (12:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Sep 2010 19:39:12 +0000 (12:39 -0700) |
* ks/recursive-rename-add-identical:
RE: [PATCH] Avoid rename/add conflict when contents are identical
RE: [PATCH] Avoid rename/add conflict when contents are identical
| 1 | 2 | |||
|---|---|---|---|---|
| merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
| t/t3030-merge-recursive.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc merge-recursive.c
Simple merge
diff --cc t/t3030-merge-recursive.sh
Simple merge