Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 48555:c91418480cb0

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
Tue, 14 Dec 2021 13:12:56 -0800 Martin von Zweigbergk simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
Tue, 07 Dec 2021 17:48:50 -0800 Martin von Zweigbergk simplemerge: make `localorother` a "mode" instead of a separate thing
Tue, 07 Dec 2021 21:17:18 -0800 Martin von Zweigbergk filemerge: stop returning always-`True` value
Mon, 06 Dec 2021 13:43:00 -0800 Martin von Zweigbergk filemerge: remove unused `orig` argument from tool functions
Mon, 06 Dec 2021 12:48:01 -0800 Martin von Zweigbergk filemerge: stop passing around 3 unused `None` values in `files` argument
Mon, 06 Dec 2021 13:15:40 -0800 Martin von Zweigbergk filemerge: rename backup variables from `back` to `backup`
Tue, 14 Dec 2021 13:41:34 -0800 Martin von Zweigbergk filemerge: remove leftover documentation of removed argument
Mon, 06 Dec 2021 12:30:54 -0800 Martin von Zweigbergk filemerge: remove `premerge` argument from `_makebackup()`
less more | (0) -100 -30 -10 -8 tip