Mercurial > public > mercurial-scm > hg

log mercurial/merge.py @ 40127:080419fa4fe4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -7 tip
age author description
Fri, 21 Sep 2018 19:48:23 -0400 Matt Harbison py3: rename pycompat.getcwd() to encoding.getcwd() (API)
Tue, 04 Sep 2018 15:55:23 -0700 Gregory Szorc merge: use vfs methods for I/O
Thu, 06 Sep 2018 18:30:12 -0700 Gregory Szorc merge: move purge logic from extension
Fri, 27 Jul 2018 14:56:10 +0300 Pulkit Goyal merge: do the trivial resolution after updating sparse checkout stable
Wed, 18 Jul 2018 09:49:34 -0700 Gregory Szorc merge: mark file gets as not thread safe (issue5933)
Tue, 29 May 2018 00:26:20 +0200 Boris Feld merge: add a 'keepconflictparent' argument to graft
Thu, 21 Jun 2018 09:32:31 -0700 Martin von Zweigbergk merge with stable
less more | (0) -300 -100 -30 -10 -7 tip