Mercurial > hg-stable
graph
-
filemerge: set default labels a little earlierThu, 20 Jan 2022 13:43:43 -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
-
branching: merge with stableTue, 18 Jan 2022 10:27:13 +0100, by Raphaël Gomès
-
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