Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 46819:d4ba4d51f85f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -30 -10 -8 tip
age author description
Thu, 25 Mar 2021 18:02:08 +0100 Rapha?l Gom?s contributor: change mentions of mpm to olivia
Thu, 04 Feb 2021 13:05:51 -0800 Martin von Zweigbergk diff: replace --merge option by config option
Mon, 11 May 2020 18:45:45 -0400 Augie Fackler filemerge: add a hacktastic version of internal:merge3 for merge diffs
Tue, 19 Jan 2021 14:00:42 -0800 Martin von Zweigbergk resolve: also detect new :mergediff conflict markers
Mon, 14 Dec 2020 18:09:37 -0800 Martin von Zweigbergk filemerge: add support for the new "mergediff" marker style to premerge
Tue, 08 Dec 2020 16:45:13 -0800 Martin von Zweigbergk mergetools: add new conflict marker format with diffs in
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Mon, 26 Oct 2020 10:33:32 -0700 Martin von Zweigbergk config: move ui.pre-merge-tool-output-template into [command-templates]
less more | (0) -100 -30 -10 -8 tip