Mercurial > hg-stable
graph
-
patch: rename "header" variable into "hdr" in diff()Tue, 26 Sep 2017 18:17:47 +0200, by Denis Laxalde
-
merge: improve comments in mergestate._makerecordsThu, 05 Oct 2017 08:03:57 -0700, by Mark Thomas
-
commands: tidy up merge state decoding in resolveMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
tests: add test for path conflicts during mergeMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
tests: add test for path conflicts during updateMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
context: also consider path conflicts when clearing unknown filesMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: check for path conflicts when merging (issue5628)Mon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
util: add safename function for generating safe names to rename toMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: improve error messages for path conflicts during updateMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: check for path conflicts when updating (issue5628)Mon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: rename conflicts to fileconflicts in _checkunknownfilesMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: add _checkunknowndirs function for detecting path conflictsMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: backup conflicting directories when getting filesMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: add merge action 'pr' to rename files during updateMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
merge: add merge action 'p' to record path conflicts during updateMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas
-
commands: update the resolve command to handle path conflictsMon, 02 Oct 2017 14:05:30 -0700, by Mark Thomas