| Tue, 26 Apr 2022 09:06:30 -0700 |
Martin von Zweigbergk |
filemerge: add configs to disable some or all partial merge tools
|
| Thu, 24 Mar 2022 22:05:36 -0700 |
Martin von Zweigbergk |
filemerge: use new function for getting first line of string
|
| Thu, 17 Mar 2022 11:19:06 -0700 |
Martin von Zweigbergk |
partial-merge: add support for `.args` config (`$local` etc.)
|
| Tue, 18 Jan 2022 13:05:21 -0800 |
Martin von Zweigbergk |
filemerge: add support for partial conflict resolution by external tool
|
| Thu, 17 Mar 2022 12:27:40 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
| 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, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
| Thu, 03 Mar 2022 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
| 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
|
