Wed, 26 Feb 2020 10:48:56 -0800 |
Martin von Zweigbergk |
tests: use new, use-case-specific methods from merge module
|
Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
Wed, 26 Feb 2020 11:00:50 -0800 |
Martin von Zweigbergk |
merge: drop redundant mergeforce argument from hg.merge()
|
Wed, 26 Feb 2020 10:54:17 -0800 |
Martin von Zweigbergk |
merge: change default of hg.merge()'s "force" argument from None to False
|
Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
Thu, 13 Feb 2020 21:55:38 -0800 |
Martin von Zweigbergk |
tests: add tests of debugmergestate with unresolved/resolved path conflicts
|
Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
Wed, 26 Feb 2020 14:43:02 -0500 |
Matt Harbison |
phabricator: update the protocol documentation
|