log

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