Mercurial > public > mercurial-scm > hg-stable

log mercurial/filemerge.py @ 48813:2bb75c65fa6c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -50 -30 tip
age author description
Tue, 15 Mar 2022 13:31:39 -0700 Martin von Zweigbergk filemerge: when merge tool uses $output, don't leave markers in $local stable
Mon, 14 Feb 2022 22:49:03 -0800 Martin von Zweigbergk filemerge: make `_maketempfiles()` more reusable
Mon, 14 Feb 2022 22:16:29 -0800 Martin von Zweigbergk filemerge: reduce some duplication in `_maketempfiles()`
Mon, 14 Feb 2022 22:11:50 -0800 Martin von Zweigbergk filemerge: use leverage `util.readfile()` in `_maketempfiles()`
Mon, 14 Feb 2022 22:04:50 -0800 Martin von Zweigbergk filemerge: move removal of `.orig` extension on temp file close to context
Mon, 14 Feb 2022 21:52:18 -0800 Martin von Zweigbergk filemerge: remove `uselocalpath` argument from `_maketempfiles()`
Fri, 11 Feb 2022 22:39:53 -0800 Martin von Zweigbergk filemerge: remove an unnecessary join with absolute path
Fri, 11 Feb 2022 21:39:55 -0800 Martin von Zweigbergk filemerge: when using in-memory merge, always put backup files in temp dir
Tue, 15 Feb 2022 20:18:57 -0800 Martin von Zweigbergk filemerge: remove unused `repo` argument from `_maketempfiles()`
Fri, 11 Feb 2022 16:52:48 -0800 Martin von Zweigbergk filemerge: put temporary files in single temp dir by default
Mon, 07 Feb 2022 22:54:38 -0800 Martin von Zweigbergk filemerge: move check for identical sides out of filemerge()
Mon, 07 Feb 2022 14:07:04 -0800 Martin von Zweigbergk simplemerge: remove now-unused arguments
Tue, 18 Jan 2022 12:57:55 -0800 Martin von Zweigbergk filemerge: when not keeping premerge, don't write markers to context
Fri, 14 Jan 2022 08:17:13 -0800 Martin von Zweigbergk simplemerge: move printing of merge result to extension
Thu, 10 Feb 2022 15:27:58 -0800 Martin von Zweigbergk simplemerge: let filemerge check for binary inputs
Thu, 20 Jan 2022 11:06:52 -0800 Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`
Thu, 20 Jan 2022 16:16:05 -0800 Martin von Zweigbergk filemerge: pass `simplemerge.MergeInput` to tool functions
Thu, 20 Jan 2022 14:42:50 -0800 Martin von Zweigbergk filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
Thu, 20 Jan 2022 13:43:43 -0800 Martin von Zweigbergk filemerge: set default labels a little earlier
Thu, 20 Jan 2022 11:17:09 -0800 Martin von Zweigbergk filemerge: remove unused arguments from `_merge()`
Thu, 20 Jan 2022 11:00:30 -0800 Martin von Zweigbergk simplemerge: take arguments as annotated context objects
Thu, 20 Jan 2022 09:04:39 -0800 Martin von Zweigbergk filemerge: make `labels` a required arg for `_premerge()`
Thu, 20 Jan 2022 14:46:16 -0800 Martin von Zweigbergk filemerge: remove unnecessary check for empty string
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`
less more | (0) -300 -100 -50 -30 tip