log

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