Mercurial > hg-stable
graph
-
merge: introduce a merge() for that use-caseWed, 26 Feb 2020 10:40:31 -0800, by Martin von Zweigbergk
-
merge: drop redundant mergeforce argument from hg.merge()Wed, 26 Feb 2020 11:00:50 -0800, by Martin von Zweigbergk
-
merge: change default of hg.merge()'s "force" argument from None to FalseWed, 26 Feb 2020 10:54:17 -0800, by Martin von Zweigbergk
-
debugmergestate: make templatedThu, 13 Feb 2020 21:14:20 -0800, by Martin von Zweigbergk
-
tests: add tests of debugmergestate with unresolved/resolved path conflictsThu, 13 Feb 2020 21:55:38 -0800, by Martin von Zweigbergk
-
mergestate: determine if active without looking for state files on diskThu, 13 Feb 2020 17:15:08 -0800, by Martin von Zweigbergk
-
phabricator: update the protocol documentationWed, 26 Feb 2020 14:43:02 -0500, by Matt Harbison
-
relnotes: move entry to the right spotWed, 26 Feb 2020 10:56:27 -0500, by Valentin Gatien-Baron