| Fri, 06 Oct 2017 06:48:43 -0700 | Ryan McElroy | merge: ensure that we always commit the mergestate | file | diff | annotate |
| Thu, 05 Oct 2017 08:03:57 -0700 | Mark Thomas | merge: improve comments in mergestate._makerecords | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: improve error messages for path conflicts during update | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when updating (issue5628) | file | diff | annotate |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: rename conflicts to fileconflicts in _checkunknownfiles | file | diff | annotate |