summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-02-14 18:51:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-14 21:02:53 (GMT)
commitea625cb0274c6907fba02f7af3ab83458b331a1e (patch)
tree2ece0a842eb7e4c79c707fc43ab984c4bbcb4247 /strbuf.h
parent53e32d4652a5cb073c8add8e7867fd7e76c2deff (diff)
downloadgit-ea625cb0274c6907fba02f7af3ab83458b331a1e.zip
git-ea625cb0274c6907fba02f7af3ab83458b331a1e.tar.gz
git-ea625cb0274c6907fba02f7af3ab83458b331a1e.tar.bz2
merge-recursive: add computation of collisions due to dir rename & merging
directory renaming and merging can cause one or more files to be moved to where an existing file is, or to cause several files to all be moved to the same (otherwise vacant) location. Add checking and reporting for such cases, falling back to no-directory-rename handling for such paths. 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 'strbuf.h')
0 files changed, 0 insertions, 0 deletions