diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:39 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:36 -0700 |
| commit | 588504b694133cba85982fbace532d2156f859eb (patch) | |
| tree | 7d47cc5892a65e3eb5a66f0ac5a44afff0c79125 /t/t5515/refs.br-unconfig_.._.git_one_two | |
| parent | t6022: Add tests for reversing order of merges when D/F conflicts present (diff) | |
| download | tgif-588504b694133cba85982fbace532d2156f859eb.tar.xz | |
t6022: Add tests with both rename source & dest involved in D/F conflicts
Having the source of a rename be involved in a directory/file conflict does
not currently pose any difficulties to the current merge-recursive
algorithm (in contrast to destinations of renames and D/F conflicts).
However, combining the two seemed like good testcases to include for
completeness.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-unconfig_.._.git_one_two')
0 files changed, 0 insertions, 0 deletions