![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Sat, 3 Dec 2005 10:41:20 +0000 (11:41 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 3 Dec 2005 20:29:05 +0000 (12:29 -0800) | ||
| commit | 72d1216a04232f5cc85c6b41109db964b55f8289 | |
| tree | 101331aeb001e6c77947a2d016ee6d485a2fdac9 | tree | snapshot |
| parent | d3bfdb755e06c04492ad3977e7df3d780b6e02f2 | commit | diff |
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>
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| t/t6020-merge-df.sh | [new file with mode: 0755] | blob |