diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-12-03 11:41:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-03 12:29:05 -0800 |
| commit | 72d1216a04232f5cc85c6b41109db964b55f8289 (patch) | |
| tree | 101331aeb001e6c77947a2d016ee6d485a2fdac9 /t/t6021-merge-criss-cross.sh | |
| parent | d3bfdb755e06c04492ad3977e7df3d780b6e02f2 (diff) | |
| download | git-72d1216a04232f5cc85c6b41109db964b55f8289.tar.gz git-72d1216a04232f5cc85c6b41109db964b55f8289.tar.xz | |
New test case: merge with directory/file conflicts
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions