diff options
| author | Alexander Gladysh <agladysh@gmail.com> | 2010-07-09 07:10:52 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-09 16:11:13 -0700 |
| commit | f433f70547ebf038a862ca72565ae42e50d4adfa (patch) | |
| tree | 23914cfee619aefe16136d3e3ecbb034064b3aa8 /merge-recursive.c | |
| parent | f15652d90c37ca56db08d325c871f2cc8f7d509e (diff) | |
| download | git-f433f70547ebf038a862ca72565ae42e50d4adfa.tar.gz git-f433f70547ebf038a862ca72565ae42e50d4adfa.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions