Fri, 21 Jan 2022 13:49:11 -0800 Martin von Zweigbergk shelve: attempt to make merge labels more helpful
Fri, 21 Jan 2022 13:48:18 -0800 Martin von Zweigbergk histedit: attempt to make merge labels more helpful
Tue, 18 Jan 2022 13:23:49 -0800 Martin von Zweigbergk update: set custom conflict label for base commit
Tue, 18 Jan 2022 15:04:55 -0800 Martin von Zweigbergk merge: set custom conflict label for base commit
Tue, 18 Jan 2022 14:57:15 -0800 Martin von Zweigbergk rebase: set custom conflict label for base commit
Thu, 20 Jan 2022 11:06:52 -0800 Martin von Zweigbergk simplemerge: take over formatting of label from `filemerge`
Thu, 20 Jan 2022 16:16:05 -0800 Martin von Zweigbergk filemerge: pass `simplemerge.MergeInput` to tool functions
Thu, 20 Jan 2022 14:42:50 -0800 Martin von Zweigbergk filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Thu, 20 Jan 2022 14:13:12 -0800 Martin von Zweigbergk filemerge: always define a "base" label
Thu, 20 Jan 2022 13:43:43 -0800 Martin von Zweigbergk filemerge: set default labels a little earlier
Tue, 18 Jan 2022 10:32:11 +0100 Raphaël Gomès helptext: add missing newline to Rust helptext stable
Mon, 24 Jan 2022 21:17:04 -0800 Martin von Zweigbergk unamend: error out when running on merge commit stable
Mon, 24 Jan 2022 21:12:19 -0800 Martin von Zweigbergk tests: demonstrate how `hg unamend` fails on merge commits stable
Thu, 20 Jan 2022 11:17:09 -0800 Martin von Zweigbergk filemerge: remove unused arguments from `_merge()`
Thu, 20 Jan 2022 11:00:30 -0800 Martin von Zweigbergk simplemerge: take arguments as annotated context objects
Thu, 20 Jan 2022 09:04:39 -0800 Martin von Zweigbergk filemerge: make `labels` a required arg for `_premerge()`
Thu, 20 Jan 2022 14:46:16 -0800 Martin von Zweigbergk filemerge: remove unnecessary check for empty string
Thu, 20 Jan 2022 23:07:35 -0800 Martin von Zweigbergk tests: also test spaces in conflict marker labels
Mon, 17 Jan 2022 21:20:46 -0500 Valentin Gatien-Baron blackbox: change year in logs to ISO 8601 format
Mon, 17 Jan 2022 21:00:33 -0500 Valentin Gatien-Baron blackbox: add milliseconds to blackbox logs by default
Mon, 17 Jan 2022 20:47:46 -0500 Valentin Gatien-Baron blackbox: correct date format doc
Thu, 20 Jan 2022 14:06:36 +0000 Arseniy Alekseyev revlog: fix a bug where transaction can be aborted partially stable
Thu, 20 Jan 2022 14:02:58 +0000 Arseniy Alekseyev revlog: demonstrate a bug where transaction can be aborted partially stable
Tue, 18 Jan 2022 10:27:13 +0100 Raphaël Gomès branching: merge with stable
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -24 +24 +50 +100 +300 +1000 +3000 tip