From: Alexander Gladysh <agladysh@gmail.com>
Date: Fri, 9 Jul 2010 13:10:52 +0000 (-0600)
Subject: Add a rename + D/F conflict testcase
X-Git-Tag: v1.7.3-rc0~30^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f433f70547ebf038a862ca72565ae42e50d4adfa?hp=f433f70547ebf038a862ca72565ae42e50d4adfa

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>
---