| Tue, 04 Jan 2022 14:21:22 -0500 |
Augie Fackler |
merge: with stable
|
changeset |
files
|
| Fri, 15 Feb 2019 17:20:32 -0500 |
Jordi Gutiérrez Hermoso |
help: properly document the default pattern
|
changeset |
files
|
| Mon, 03 Jan 2022 10:43:17 +0100 |
Raphaël Gomès |
heptapod-ci: make Windows jobs manual again
stable
|
changeset |
files
|
| Wed, 25 Aug 2021 17:14:47 +0200 |
Julien Cristau |
tests: allow for variation in zstd output as seen on s390x and powerpc
stable
|
changeset |
files
|
| Fri, 10 Dec 2021 16:25:02 +0100 |
pacien |
hg-core: dedup LazyAncestors Iterator impl
|
changeset |
files
|
| Tue, 16 Nov 2021 18:54:05 +0100 |
pacien |
hg-cpython: use ancestor iterator impls from vcsgraph
|
changeset |
files
|
| Fri, 10 Dec 2021 15:27:22 +0100 |
pacien |
hg-cpython: implement vcsgraph::Graph for our Index
|
changeset |
files
|
| Fri, 10 Dec 2021 15:22:24 +0100 |
pacien |
rust: add vcsgraph crate as dependency
|
changeset |
files
|
| 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
|
| Mon, 06 Dec 2021 12:48:01 -0800 |
Martin von Zweigbergk |
filemerge: stop passing around 3 unused `None` values in `files` argument
|
changeset |
files
|
| Mon, 06 Dec 2021 13:15:40 -0800 |
Martin von Zweigbergk |
filemerge: rename backup variables from `back` to `backup`
|
changeset |
files
|
| Sat, 18 Dec 2021 20:56:52 -0500 |
Matt Harbison |
setup.py: fix some documentation typos
|
changeset |
files
|
| Fri, 17 Dec 2021 14:15:08 +0100 |
Simon Sapin |
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
|
changeset |
files
|