aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-02-14 10:51:48 -0800
committerJunio C Hamano <gitster@pobox.com>2018-02-14 13:02:52 -0800
commite04d4a23d8d479802e9943b41ab74465906e5b0d (patch)
tree12f70f2b183a59c1e0d7e236b5f5a5d7a09c6723 /merge-recursive.c
parent1619442e7bee286c723eac106ff26332b2b5d298 (diff)
downloadgit-e04d4a23d8d479802e9943b41ab74465906e5b0d.tar.gz
directory rename detection: tests for handling overwriting dirty files
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions