summaryrefslogtreecommitdiff
path: root/vcs-svn
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2010-09-20 02:29:04 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 17:37:04 -0700
commit71f7ffcc02a2f38436c59146b86897389130a538 (patch)
treee28a7efbfae0ced88c94362c854e91ff443afb55 /vcs-svn
parentmerge-recursive: Delay content merging for renames (diff)
downloadtgif-71f7ffcc02a2f38436c59146b86897389130a538.tar.xz
merge-recursive: Delay modify/delete conflicts if D/F conflict present
When handling merges with modify/delete conflicts, if the modified path is involved in a D/F conflict, handle the issue in process_df_entry() rather than process_entry(). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'vcs-svn')
0 files changed, 0 insertions, 0 deletions