Mercurial > public > mercurial-scm > hg
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 |