diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:36 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:31 -0700 |
| commit | 7b4ed5941c0d2143cb4467a9e265993121b62ce7 (patch) | |
| tree | 98e963103aaa5e2461d89f0380933719e82b9b0d /t/t3301-notes.sh | |
| parent | 58040239f59004f71d9ae70d0fcd9e0d4f6a3259 (diff) | |
| download | git-7b4ed5941c0d2143cb4467a9e265993121b62ce7.tar.gz git-7b4ed5941c0d2143cb4467a9e265993121b62ce7.tar.xz | |
t6042: Add a pair of cases where undetected renames cause issues
An undetected rename can cause a silent success where a conflict should
have been detected, or can cause an erroneous conflict state where the
merge should have been resolvable. Add testcases for both.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3301-notes.sh')
0 files changed, 0 insertions, 0 deletions