| Tue, 26 Sep 2017 18:17:47 +0200 | Denis Laxalde | patch: rename "header" variable into "hdr" in diff() | changeset | files |
| Thu, 05 Oct 2017 08:03:57 -0700 | Mark Thomas | merge: improve comments in mergestate._makerecords | changeset | files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | commands: tidy up merge state decoding in resolve | changeset | files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add test for path conflicts during merge | changeset | files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | tests: add test for path conflicts during update | changeset | files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | context: also consider path conflicts when clearing unknown files | changeset | files |
| Mon, 02 Oct 2017 14:05:30 -0700 | Mark Thomas | merge: check for path conflicts when merging (issue5628) | changeset | files |