Mercurial > hg
graph
-
merge: set custom conflict label for base commitTue, 18 Jan 2022 15:04:55 -0800, by Martin von Zweigbergk
-
rebase: set custom conflict label for base commitTue, 18 Jan 2022 14:57:15 -0800, by Martin von Zweigbergk
-
simplemerge: take over formatting of label from `filemerge`Thu, 20 Jan 2022 11:06:52 -0800, by Martin von Zweigbergk
-
filemerge: pass `simplemerge.MergeInput` to tool functionsThu, 20 Jan 2022 16:16:05 -0800, by Martin von Zweigbergk
-
filemerge: work with `simplemerge.MergeInput` in `filemerge()`Thu, 20 Jan 2022 14:42:50 -0800, by Martin von Zweigbergk
-
filemerge: always define a "base" labelThu, 20 Jan 2022 14:13:12 -0800, by Martin von Zweigbergk
-
filemerge: set default labels a little earlierThu, 20 Jan 2022 13:43:43 -0800, by Martin von Zweigbergk
-
helptext: add missing newline to Rust helptext stableTue, 18 Jan 2022 10:32:11 +0100, by Raphaël Gomès
-
unamend: error out when running on merge commit stableMon, 24 Jan 2022 21:17:04 -0800, by Martin von Zweigbergk
-
tests: demonstrate how `hg unamend` fails on merge commits stableMon, 24 Jan 2022 21:12:19 -0800, by Martin von Zweigbergk
-
filemerge: remove unused arguments from `_merge()`Thu, 20 Jan 2022 11:17:09 -0800, by Martin von Zweigbergk
-
simplemerge: take arguments as annotated context objectsThu, 20 Jan 2022 11:00:30 -0800, by Martin von Zweigbergk
-
filemerge: make `labels` a required arg for `_premerge()`Thu, 20 Jan 2022 09:04:39 -0800, by Martin von Zweigbergk
-
filemerge: remove unnecessary check for empty stringThu, 20 Jan 2022 14:46:16 -0800, by Martin von Zweigbergk
-
tests: also test spaces in conflict marker labelsThu, 20 Jan 2022 23:07:35 -0800, by Martin von Zweigbergk
-
blackbox: change year in logs to ISO 8601 formatMon, 17 Jan 2022 21:20:46 -0500, by Valentin Gatien-Baron
-
blackbox: add milliseconds to blackbox logs by defaultMon, 17 Jan 2022 21:00:33 -0500, by Valentin Gatien-Baron
-
blackbox: correct date format docMon, 17 Jan 2022 20:47:46 -0500, by Valentin Gatien-Baron
-
revlog: fix a bug where transaction can be aborted partially stableThu, 20 Jan 2022 14:06:36 +0000, by Arseniy Alekseyev
-
revlog: demonstrate a bug where transaction can be aborted partially stableThu, 20 Jan 2022 14:02:58 +0000, by Arseniy Alekseyev
-
branching: merge with stableTue, 18 Jan 2022 10:27:13 +0100, by Raphaël Gomès
-
rust: fix build errors on darwin stableThu, 30 Dec 2021 13:25:44 +0100, by Dan Villiom Podlaski Christiansen
-
rust: Fix outdated comments in OwningDirstateMapMon, 17 Jan 2022 12:50:13 +0100, by Simon Sapin
-
merge: consider the file merged when using :merge-{local,other}Fri, 14 Jan 2022 09:28:44 -0800, by Martin von Zweigbergk
-
simplemerge: delete unused exception class `CantReprocessAndShowBase`Fri, 14 Jan 2022 08:44:36 -0800, by Martin von Zweigbergk
-
simplemerge: change _minimize() to minimize a single conflictTue, 11 Jan 2022 22:13:56 -0800, by Martin von Zweigbergk
-
simplemerge: make minimize() a free functionTue, 11 Jan 2022 22:03:55 -0800, by Martin von Zweigbergk
-
simplemerge: simplify and rename `render_markers()`Tue, 11 Jan 2022 21:56:27 -0800, by Martin von Zweigbergk
-
simplemerge: split out function for rendering :merge3 conflict markersTue, 11 Jan 2022 16:23:10 -0800, by Martin von Zweigbergk
-
simplemerge: move default labels to simplemerge extensionFri, 07 Jan 2022 23:29:19 -0800, by Martin von Zweigbergk