Mercurial Mercurial > public > mercurial-scm > hg / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -100 -30 -10 -8 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
Thu, 24 Oct 2024 17:35:53 +0200 Arseniy Alekseyev merge: add a config to allow conflict-free merge of changes on adjacent lines file | diff | annotate
Mon, 16 Sep 2024 15:36:44 +0200 Matt Harbison typing: add `from __future__ import annotations` to most files file | diff | annotate
Thu, 26 Jan 2023 00:23:07 +0100 C?dric Krier filemerge: add union-other-first as internal merge tool file | diff | annotate
Sun, 29 May 2022 15:17:27 +0200 Manuel Jacob py3: replace `pycompat.xrange` by `range` file | diff | annotate
Tue, 18 Jan 2022 13:05:21 -0800 Martin von Zweigbergk filemerge: add support for partial conflict resolution by external tool file | diff | annotate
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object): file | diff | annotate
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements file | diff | annotate
Mon, 07 Feb 2022 14:07:04 -0800 Martin von Zweigbergk simplemerge: remove now-unused arguments file | diff | annotate
less more (0) -100 -30 -10 -8 tip
mercurial-scm/hg