diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:16 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:38 -0700 |
| commit | 232c635f7e22acb2ddf526753fdcd3d3718afe99 (patch) | |
| tree | 2b8561fd296ad9046a1b49241c3a04003d6f8852 /t/t2010-checkout-ambiguous.sh | |
| parent | merge-recursive: Defer rename/rename(2to1) handling until process_entry (diff) | |
| download | tgif-232c635f7e22acb2ddf526753fdcd3d3718afe99.tar.xz | |
merge-recursive: Record more data needed for merging with dual renames
When two different files are renamed to one, we need to be able to do
three-way merges for both of those files. To do that, we need to record
the sha1sum of the (possibly modified) file on the unrenamed side. Modify
setup_rename_conflict_info() to take this extra information and record it
when the rename_type is RENAME_TWO_FILES_TO_ONE.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2010-checkout-ambiguous.sh')
0 files changed, 0 insertions, 0 deletions