diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:56 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144 (patch) | |
| tree | a0f6aa600a85b460c96cd8d6984c1bb857bc3703 /merge-recursive.h | |
| parent | merge-recursive: Fix recursive case with D/F conflict via add/add conflict (diff) | |
| download | git-f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144.tar.gz git-f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144.zip | |
merge-recursive: Fix sorting order and directory change assumptions
We cannot assume that directory/file conflicts will appear in sorted
order; for example, 'letters.txt' comes between 'letters' and
'letters/file'.
Thanks to Johannes for a pointer about qsort stability issues with
Windows and suggested code change.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions