diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-02-14 10:51:57 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-14 13:02:53 -0800 |
| commit | ea625cb0274c6907fba02f7af3ab83458b331a1e (patch) | |
| tree | 2ece0a842eb7e4c79c707fc43ab984c4bbcb4247 /git-rebase--am.sh | |
| parent | merge-recursive: check for directory level conflicts (diff) | |
| download | tgif-ea625cb0274c6907fba02f7af3ab83458b331a1e.tar.xz | |
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 'git-rebase--am.sh')
0 files changed, 0 insertions, 0 deletions