1 Commits (bff82d0cdaf29ec0f8b1f5f166100770c044388f)

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