merge-recursive: fix was_tracked() to quit lying with some renamed paths
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:20 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commita35edc8...bdd6134d7aaa7bb0d220941154fe9e7e
treecf39677...2475ee83e407c8abb8c39542c79755d6copy hash to clipboard (tree)
parentc04ba51...39a7771583e31966adb7c472980f3fc3copy hash to clipboard (diff)
merge-recursive.c
merge-recursive.h