am: avoid directory rename detection when calling recursive merge machinery
authorElijah Newren <newren@gmail.com>
Wed, 29 Aug 2018 07:06:13 +0000 (00:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Aug 2018 14:58:59 +0000 (07:58 -0700)
commit6aba117...5cf7128e7bc942888263552fe927e13f
tree2cbc886...390321a969fa938a961bc618a9124d98copy hash to clipboard (tree)
parent5fdddd9...757a50c9a583936e7e6e44ec96d2d651copy hash to clipboard (diff)
builtin/am.c
t/t3401-rebase-and-am-rename.sh