Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | util: add safename function for generating safe names to rename to | changeset | files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update | changeset | files |