diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:37 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:31 -0700 |
| commit | a0551f212edd13e3df0d3dcd5abf148e0f003e59 (patch) | |
| tree | 2da1ca000f7229a0e365ca9d4100c80c7ce9550d /t/t4101-apply-nonl.sh | |
| parent | t6042: Add a pair of cases where undetected renames cause issues (diff) | |
| download | tgif-a0551f212edd13e3df0d3dcd5abf148e0f003e59.tar.xz | |
t6042: Add a testcase where undetected rename causes silent file deletion
There are cases where history should merge cleanly, and which current git
does merge cleanly despite not detecting a rename; however the merge
currently nukes files that should not be removed.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4101-apply-nonl.sh')
0 files changed, 0 insertions, 0 deletions