log

age author description
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