Commit Graph

1 Commits (e3a0ca878457ecc70d0065802fcb0c6875c6b671)

Author SHA1 Message Date
Fredrik Kuivinen 72d1216a04 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>
2005-12-03 12:29:05 -08:00