| commit | 4ab9a157d06956ce5a1060a28404cbade3039fa2 | |
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:29:07 +0000 (20 02:29 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:37:05 +0000 (29 17:37 -0700) | ||
| tree | 0f3d2f973c2aac4f780d10ba13c030498b62e508 | treesnapshot (tar.gz zip) |
| parent | 2adc7dcc111636ed16601dc7516ced1c5cfda088 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory | |
| t/t6022-merge-rename.sh | diffblobblamehistory |