checkout_conflicts.c
15.4 KB
-
checkout rename conflicts · 96d799aarename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
Edward Thomson committed
rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS