Markus Unterwaditzer e457586b29 Fix bug in custom conflict_resolution ... Fix #563		2017-02-26 23:24:30 +01:00
..
test_config.py	Fix bug in custom conflict_resolution	2017-02-26 23:24:30 +01:00
test_discover.py	Don't fail when discovery fails	2017-01-30 12:48:18 +01:00