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