diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:07 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:05 -0700 |
| commit | 4ab9a157d06956ce5a1060a28404cbade3039fa2 (patch) | |
| tree | 0f3d2f973c2aac4f780d10ba13c030498b62e508 /upload-pack.c | |
| parent | 2adc7dcc111636ed16601dc7516ced1c5cfda088 (diff) | |
| download | git-4ab9a157d06956ce5a1060a28404cbade3039fa2.tar.gz git-4ab9a157d06956ce5a1060a28404cbade3039fa2.tar.xz | |
merge_content(): 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 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions