Thu, 13 Feb 2020 21:55:38 -0800 | Martin von Zweigbergk | tests: add tests of debugmergestate with unresolved/resolved path conflicts | changeset | files |
Thu, 13 Feb 2020 17:15:08 -0800 | Martin von Zweigbergk | mergestate: determine if active without looking for state files on disk | changeset | files |