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