Mercurial > hg
graph
-
histedit: attempt to make merge labels more helpfulFri, 21 Jan 2022 13:48:18 -0800, by Martin von Zweigbergk
-
update: set custom conflict label for base commitTue, 18 Jan 2022 13:23:49 -0800, by Martin von Zweigbergk
-
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