checkout rename conflicts rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
2013-07-23T15:32:42