projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f15652d) | patch
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)
commitf433f70547ebf038a862ca72565ae42e50d4adfa
tree23914cfee619aefe16136d3e3ecbb034064b3aa8tree | snapshot
parentf15652d90c37ca56db08d325c871f2cc8f7d509ecommit | diff
Add a rename + D/F conflict testcase

This is a simple testcase where both sides of the rename are paths involved
in (separate) D/F merge conflicts

Signed-off-by: Alexander Gladysh <agladysh@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3509-cherry-pick-merge-df.sh [new file with mode: 0755] blob
Git—the stupid content tracker