Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when updating (issue5628) | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: rename conflicts to fileconflicts in _checkunknownfiles | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add _checkunknowndirs function for detecting path conflicts | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: backup conflicting directories when getting files | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: add merge action 'pr' to rename files during update | changeset | files |