Mercurial > hg
log
age | author | description |
---|---|---|
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | context: also consider path conflicts when clearing unknown files |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | util: add safename function for generating safe names to rename to |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when updating (issue5628) |
Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: rename conflicts to fileconflicts in _checkunknownfiles |