diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:46 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | f63622c0a9665913f7ebade27910d8094ab4f9c4 (patch) | |
| tree | 94cdeb0164fc63c23cc9cf3ae777652ae1637de7 /diff-no-index.c | |
| parent | t6036: Add a second testcase similar to the first but with content changes (diff) | |
| download | tgif-f63622c0a9665913f7ebade27910d8094ab4f9c4.tar.xz | |
t6036: Add testcase for undetected conflict
If merging two lines of development involves a rename/add conflict, and two
different people make such a merge but resolve it differently, and then
someone tries to merge the resulting two merges, then they should clearly
get a conflict due to the different resolutions from the previous
developers. However, in some such cases the conflict would not be detected
and git would silently accept one of the two versions being merged as the
final merge resolution.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions