summaryrefslogtreecommitdiff
path: root/compat/inet_ntop.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-02-14 10:51:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-14 13:02:52 -0800
commit53e32d4652a5cb073c8add8e7867fd7e76c2deff (patch)
tree1f4945826bc55dc854be5e3e7cb10c695aef374b /compat/inet_ntop.c
parentmerge-recursive: add get_directory_renames() (diff)
downloadtgif-53e32d4652a5cb073c8add8e7867fd7e76c2deff.tar.xz
merge-recursive: check for directory level conflicts
Before trying to apply directory renames to paths within the given directories, we want to make sure that there aren't conflicts at the directory level. There will be additional checks at the individual file level too, which will be added later. 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 'compat/inet_ntop.c')
0 files changed, 0 insertions, 0 deletions