2 Commits

Author	SHA1	Message	Date
Edward Thomson	96d799aa18	checkout rename conflicts ... rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS	2013-10-16 16:20:10 -04:00
Edward Thomson	629b661caa	checkout (from index) can write conflicts	2013-10-16 16:20:06 -04:00