Mercurial > hg
graph
-
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