summaryrefslogtreecommitdiff
path: root/vcs-svn/line_buffer.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-04-19 10:58:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 16:11:00 +0900
commit18797a3b10e4077473740b953651b0032828d0fb (patch)
treef47ccb5234057e94b141fa106e0363d8ac8b6e1c /vcs-svn/line_buffer.h
parentmerge-recursive: fix overwriting dirty files involved in renames (diff)
downloadtgif-18797a3b10e4077473740b953651b0032828d0fb.tar.xz
merge-recursive: fix remaining directory rename + dirty overwrite cases
Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'vcs-svn/line_buffer.h')
0 files changed, 0 insertions, 0 deletions