log mercurial/simplemerge.py @ 44947:ad6971e6740c

age author description
Tue, 02 Jun 2020 21:39:07 +0900 Yuya Nishihara simplemerge: fix function name that tests if ctx is not null revision
Sat, 16 May 2020 20:38:19 +0200 Pierre-Yves David flags: actually merge flags in simplemerge stable
Wed, 06 Nov 2019 15:42:30 -0500 Augie Fackler simplemerge: disable a pytype error where it's just confused
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Wed, 20 Feb 2019 19:28:51 -0500 Augie Fackler cleanup: use () to wrap long lines instead of \
Wed, 01 Aug 2018 13:00:45 -0700 Gregory Szorc global: use pycompat.xrange()
Thu, 22 Mar 2018 21:56:20 +0900 Yuya Nishihara stringutil: bulk-replace call sites to point to new module
Sun, 10 Dec 2017 04:48:24 +0530 Pulkit Goyal py3: handle keyword arguments correctly in simplemerge.py
Fri, 01 Sep 2017 10:35:43 -0700 Phil Cohen simplemerge: remove unused `repo` parameter
Fri, 25 Aug 2017 13:49:17 -0700 Phil Cohen simplemerge: refactor _picklabels to be more compact
Fri, 25 Aug 2017 13:49:16 -0700 Phil Cohen simplemerge: remove check for null context