Add a rename + D/F conflict testcase
authorAlexander Gladysh <agladysh@gmail.com>
Fri, 9 Jul 2010 13:10:52 +0000 (07:10 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Jul 2010 23:11:13 +0000 (16:11 -0700)
commitf433f70...47ebf038a862ca72565ae42e50d4adfa
tree23914cf...e619aefe16136d3e3ecbb034064b3aa8copy hash to clipboard (tree)
parentf15652d...0c37ca56db08d325c871f2cc8f7d509ecopy hash to clipboard (diff)
t/t3509-cherry-pick-merge-df.sh [new file with mode: 0755]