Mercurial > public > mercurial-scm > hg

log mercurial/mergeutil.py @ 53042:cdd7bf612c7b stable tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -7 tip
age author description
Mon, 16 Sep 2024 15:36:44 +0200 Matt Harbison typing: add `from __future__ import annotations` to most files
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Thu, 25 Mar 2021 18:02:08 +0100 Rapha?l Gom?s contributor: change mentions of mpm to olivia
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Mon, 23 Nov 2020 16:48:13 -0800 Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
less more | (0) -7 tip