| Tue, 07 Dec 2021 23:01:20 -0800 |
Martin von Zweigbergk |
simplemerge: don't calculate conflict labels when resolving automatically
|
changeset |
files
|
| Tue, 07 Dec 2021 22:45:31 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
|
changeset |
files
|
| Tue, 07 Dec 2021 22:33:18 -0800 |
Martin von Zweigbergk |
simplemerge: add a specialized function for "union", "local", "other"
|
changeset |
files
|
| Sat, 18 Dec 2021 11:47:03 +0100 |
Simon Sapin |
rhg: Fall back to Python if verbose status is requested by config
|
changeset |
files
|
| Fri, 17 Dec 2021 17:56:13 +0100 |
Simon Sapin |
rhg: Accept different "invalid ignore pattern" error message formatting
|
changeset |
files
|
| Fri, 17 Dec 2021 16:54:22 +0100 |
Simon Sapin |
rhg: Properly format warnings related to ignore patterns
|
changeset |
files
|
| Tue, 09 Nov 2021 18:17:52 +0100 |
Simon Sapin |
rhg: Sub-repositories are not supported
|
changeset |
files
|
| Tue, 07 Dec 2021 17:48:50 -0800 |
Martin von Zweigbergk |
simplemerge: make `localorother` a "mode" instead of a separate thing
|
changeset |
files
|
| Tue, 07 Dec 2021 14:11:58 -0800 |
Martin von Zweigbergk |
simplemerge: avoid a call to `pycompat.strkwargs()`
|
changeset |
files
|
| Mon, 06 Dec 2021 23:17:43 -0800 |
Martin von Zweigbergk |
simplemerge: stop merging file flags
|
changeset |
files
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
changeset |
files
|
| Mon, 06 Dec 2021 13:43:00 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `orig` argument from tool functions
|
changeset |
files
|