diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:41 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:32 -0700 |
| commit | fe7e9c23e4ef183eaff5256a7ce681296f3a92f6 (patch) | |
| tree | b0b84d0ac3d020321eb58ce5528b4ab99e6e532b /vcs-svn | |
| parent | t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts (diff) | |
| download | tgif-fe7e9c23e4ef183eaff5256a7ce681296f3a92f6.tar.xz | |
t6036: Add differently resolved modify/delete conflict in criss-cross test
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'vcs-svn')
0 files changed, 0 insertions, 0 deletions