| Mon, 09 Oct 2017 10:09:36 -0700 |
Eamonn Kent |
fsmonitor: change the distance calculation
|
| Mon, 09 Oct 2017 16:31:43 +0200 |
Boris Feld |
configitems: update default value of 'phases.new-commit'
|
| Mon, 09 Oct 2017 17:33:03 +0200 |
Boris Feld |
mq: use the newcommitphase utility
|
| Tue, 26 Sep 2017 18:17:47 +0200 |
Denis Laxalde |
patch: rename "header" variable into "hdr" in diff()
|
| Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
commands: tidy up merge state decoding in resolve
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during merge
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during update
|
| 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
|
