fighting with Travis
fighting with Travis
testing new potential Travis setup
testing new potential Travis setup
testing new potential Travis setup
testing new potential Travis setup
testing new potential Travis setup
clean up after debug

finally understood what way around in the Travis env
re-added COVER directory to ignorelist

anyone is able to reproducethe COVER generation with nose.bat,
it's a waste of timeto maintain it
typo
tidied up a bit
tidying up, still
updated _logging branch to include tests
updated conflict test

reduced speed impact on conflict resolution

added "balanced" tests, which are testing conflict
resolution for the same two units
added headers & switched to Win CRLF style
added *.~* to ignore list
updated _logging subtree
merged subtree bobgit
added nose.bat, silly me ^^
re-added nose.bat for whoever might need it