t6020: Add a testcase for modify/delete + directory/file conflict
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:43 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commitfa0ae3b...ddeeb8c872f3804950fa95b5fc8b4138
tree91993f4...54494db14edbeb88dd7f066f90d4dd8acopy hash to clipboard (tree)
parentd09c0a3...35c6f28b1e7710f3f08a6ff5dec50f73copy hash to clipboard (diff)
t/t6020-merge-df.sh