Mercurial > hg-stable
graph
-
commit: error out on unresolved files even if commit would be emptyFri, 28 Feb 2020 10:30:18 -0800, by Martin von Zweigbergk
-
tests: add test of committing with conflicts but no changes in wdirFri, 28 Feb 2020 10:49:13 -0800, by Martin von Zweigbergk
-
transaction: clarify the logic around pre-finalize/post-finalizeFri, 28 Feb 2020 00:17:26 +0100, by Pierre-Yves David
-
transaction: move constant to upper caseFri, 28 Feb 2020 00:02:03 +0100, by Pierre-Yves David
-
tests: handle In-Reply-To headers for line wrappingWed, 26 Feb 2020 22:26:28 +0100, by Joerg Sonnenberger
-
tests: use new, use-case-specific methods from merge moduleWed, 26 Feb 2020 10:48:56 -0800, by Martin von Zweigbergk
-
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