diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:08 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:05 -0700 |
| commit | 84a08a47b9559e76df96645c536845f31ba4dc7b (patch) | |
| tree | a8e060859a43ef7dd6d600a96101138d7a6224f2 /t/t1012-read-tree-df.sh | |
| parent | merge_content(): Check whether D/F conflicts are still present (diff) | |
| download | tgif-84a08a47b9559e76df96645c536845f31ba4dc7b.tar.xz | |
handle_delete_modify(): Check whether D/F conflicts are still present
If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1012-read-tree-df.sh')
0 files changed, 0 insertions, 0 deletions