![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 17 Aug 2010 23:53:18 +0000 (17:53 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:08:05 +0000 (12:08 -0700) | ||
| commit | 5601ba6574cfbd1249a6d38b72159a7d3ccf8315 | |
| tree | de3761e7c4eeb430f8ca391873c83e9ce8e79007 | tree | snapshot |
| parent | a3e413675478585206966bdbb7fd7bf24b9d1ea7 | commit | diff |
t6031: Add a testcase covering multiple renames across a D/F conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6031-merge-recursive.sh | diff | blob | history |