Sun, 01 Mar 2020 19:39:23 +0100 | Manuel Jacob | branch: make --force work even when specifying revs | changeset | files |
Wed, 26 Feb 2020 10:48:56 -0800 | Martin von Zweigbergk | tests: use new, use-case-specific methods from merge module | changeset | files |
Wed, 26 Feb 2020 10:40:31 -0800 | Martin von Zweigbergk | merge: introduce a merge() for that use-case | changeset | files |
Wed, 26 Feb 2020 11:00:50 -0800 | Martin von Zweigbergk | merge: drop redundant mergeforce argument from hg.merge() | changeset | files |
Wed, 26 Feb 2020 10:54:17 -0800 | Martin von Zweigbergk | merge: change default of hg.merge()'s "force" argument from None to False | changeset | files |
Thu, 13 Feb 2020 21:14:20 -0800 | Martin von Zweigbergk | debugmergestate: make templated | changeset | files |
Thu, 13 Feb 2020 21:55:38 -0800 | Martin von Zweigbergk | tests: add tests of debugmergestate with unresolved/resolved path conflicts | changeset | files |