1 commit

Author	SHA1	Message	Date
Nagy Gabor	e4b1a97ff2	New fileconflict005.py pactest ... This makes the fileconflict004.py test complete. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>	2008-07-29 21:46:36 -05:00