diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:50 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:38 -0700 |
| commit | 6ef2cb008f132e4649ef925a8e1950d3138054d5 (patch) | |
| tree | caff30b74c5a7b66ea094afd6d50b5cdffb03ae0 /git_remote_helpers | |
| parent | merge-recursive: Nuke rename/directory conflict detection (diff) | |
| download | tgif-6ef2cb008f132e4649ef925a8e1950d3138054d5.tar.xz | |
merge-recursive: Move rename/delete handling into dedicated function
This move is in preparation for the function growing and being called from
multiple places in order to handle D/F conflicts.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers')
0 files changed, 0 insertions, 0 deletions