| Sun, 20 Nov 2022 23:09:12 -0500 |
Matt Harbison |
configitems: add a default value for "merge-tools.xxx.regappend"
|
file |
diff |
annotate
|
| Tue, 26 Apr 2022 09:06:30 -0700 |
Martin von Zweigbergk |
filemerge: add configs to disable some or all partial merge tools
|
file |
diff |
annotate
|
| Thu, 24 Mar 2022 22:05:36 -0700 |
Martin von Zweigbergk |
filemerge: use new function for getting first line of string
|
file |
diff |
annotate
|
| Thu, 17 Mar 2022 11:19:06 -0700 |
Martin von Zweigbergk |
partial-merge: add support for `.args` config (`$local` etc.)
|
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
|
| Thu, 17 Mar 2022 12:27:40 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
file |
diff |
annotate
|
| Tue, 15 Mar 2022 13:31:39 -0700 |
Martin von Zweigbergk |
filemerge: when merge tool uses $output, don't leave markers in $local
stable
|
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 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
file |
diff |
annotate
|
| Mon, 14 Feb 2022 22:49:03 -0800 |
Martin von Zweigbergk |
filemerge: make `_maketempfiles()` more reusable
|
file |
diff |
annotate
|
| Mon, 14 Feb 2022 22:16:29 -0800 |
Martin von Zweigbergk |
filemerge: reduce some duplication in `_maketempfiles()`
|
file |
diff |
annotate
|
| Mon, 14 Feb 2022 22:11:50 -0800 |
Martin von Zweigbergk |
filemerge: use leverage `util.readfile()` in `_maketempfiles()`
|
file |
diff |
annotate
|
| Mon, 14 Feb 2022 22:04:50 -0800 |
Martin von Zweigbergk |
filemerge: move removal of `.orig` extension on temp file close to context
|
file |
diff |
annotate
|
| Mon, 14 Feb 2022 21:52:18 -0800 |
Martin von Zweigbergk |
filemerge: remove `uselocalpath` argument from `_maketempfiles()`
|
file |
diff |
annotate
|
| Fri, 11 Feb 2022 22:39:53 -0800 |
Martin von Zweigbergk |
filemerge: remove an unnecessary join with absolute path
|
file |
diff |
annotate
|
| Fri, 11 Feb 2022 21:39:55 -0800 |
Martin von Zweigbergk |
filemerge: when using in-memory merge, always put backup files in temp dir
|
file |
diff |
annotate
|
| Tue, 15 Feb 2022 20:18:57 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `repo` argument from `_maketempfiles()`
|
file |
diff |
annotate
|
| Fri, 11 Feb 2022 16:52:48 -0800 |
Martin von Zweigbergk |
filemerge: put temporary files in single temp dir by default
|
file |
diff |
annotate
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
file |
diff |
annotate
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
file |
diff |
annotate
|
| Tue, 18 Jan 2022 12:57:55 -0800 |
Martin von Zweigbergk |
filemerge: when not keeping premerge, don't write markers to context
|
file |
diff |
annotate
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
file |
diff |
annotate
|
| Thu, 10 Feb 2022 15:27:58 -0800 |
Martin von Zweigbergk |
simplemerge: let filemerge check for binary inputs
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 16:16:05 -0800 |
Martin von Zweigbergk |
filemerge: pass `simplemerge.MergeInput` to tool functions
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:42:50 -0800 |
Martin von Zweigbergk |
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 13:43:43 -0800 |
Martin von Zweigbergk |
filemerge: set default labels a little earlier
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 11:17:09 -0800 |
Martin von Zweigbergk |
filemerge: remove unused arguments from `_merge()`
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 09:04:39 -0800 |
Martin von Zweigbergk |
filemerge: make `labels` a required arg for `_premerge()`
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:46:16 -0800 |
Martin von Zweigbergk |
filemerge: remove unnecessary check for empty string
|
file |
diff |
annotate
|
| Tue, 14 Dec 2021 13:12:56 -0800 |
Martin von Zweigbergk |
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
|
file |
diff |
annotate
|
| Tue, 07 Dec 2021 17:48:50 -0800 |
Martin von Zweigbergk |
simplemerge: make `localorother` a "mode" instead of a separate thing
|
file |
diff |
annotate
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
file |
diff |
annotate
|
| Mon, 06 Dec 2021 13:43:00 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `orig` argument from tool functions
|
file |
diff |
annotate
|
| Mon, 06 Dec 2021 12:48:01 -0800 |
Martin von Zweigbergk |
filemerge: stop passing around 3 unused `None` values in `files` argument
|
file |
diff |
annotate
|
| Mon, 06 Dec 2021 13:15:40 -0800 |
Martin von Zweigbergk |
filemerge: rename backup variables from `back` to `backup`
|
file |
diff |
annotate
|
| Tue, 14 Dec 2021 13:41:34 -0800 |
Martin von Zweigbergk |
filemerge: remove leftover documentation of removed argument
|
file |
diff |
annotate
|
| Mon, 06 Dec 2021 12:30:54 -0800 |
Martin von Zweigbergk |
filemerge: remove `premerge` argument from `_makebackup()`
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 22:45:35 -0800 |
Martin von Zweigbergk |
filemerge: inline `_filemerge()` into `filemerge()`
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
file |
diff |
annotate
|
| Fri, 19 Nov 2021 18:48:34 -0800 |
Martin von Zweigbergk |
filemerge: simplify slightly by using filectx.decodeddata()
|
file |
diff |
annotate
|
| Fri, 19 Nov 2021 18:14:25 -0800 |
Martin von Zweigbergk |
filemerge: rename _formatconflictmarker() since it formats a label
|
file |
diff |
annotate
|
| Tue, 07 Sep 2021 11:50:12 -0700 |
Kyle Lippincott |
filemerge: be more strict when detecting conflict markers, add `|` markers
stable
|
file |
diff |
annotate
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
file |
diff |
annotate
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
file |
diff |
annotate
|
| Thu, 04 Feb 2021 13:05:51 -0800 |
Martin von Zweigbergk |
diff: replace --merge option by config option
|
file |
diff |
annotate
|
| Mon, 11 May 2020 18:45:45 -0400 |
Augie Fackler |
filemerge: add a hacktastic version of internal:merge3 for merge diffs
|
file |
diff |
annotate
|
| Tue, 19 Jan 2021 14:00:42 -0800 |
Martin von Zweigbergk |
resolve: also detect new :mergediff conflict markers
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
file |
diff |
annotate
|
| Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Mon, 26 Oct 2020 10:33:32 -0700 |
Martin von Zweigbergk |
config: move ui.pre-merge-tool-output-template into [command-templates]
|
file |
diff |
annotate
|
| Fri, 23 Oct 2020 15:59:32 -0700 |
Martin von Zweigbergk |
config: rename ui.mergemarkertemplate to command-templates.mergemarker
|
file |
diff |
annotate
|
| Thu, 28 May 2020 16:16:13 -0400 |
Augie Fackler |
filemerge: add __bytes__ for absentfilectx
|
file |
diff |
annotate
|
| Wed, 20 Nov 2019 13:03:22 -0500 |
Matt Harbison |
filemerge: fix a missing attribute usage
|
file |
diff |
annotate
|
| Wed, 20 Nov 2019 13:01:56 -0500 |
Matt Harbison |
filemerge: drop a default argument to appease pytype
|
file |
diff |
annotate
|