Mercurial > hg
graph
-
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
-
simplemerge: use same newline detection for :mergediff as for :merge[3]Fri, 07 Jan 2022 22:23:44 -0800, by Martin von Zweigbergk
-
simplemerge: clarify names of functions that render conflict markersTue, 11 Jan 2022 16:54:42 -0800, by Martin von Zweigbergk
-
simplemerge: make merge_lines() a free functionFri, 07 Jan 2022 22:16:22 -0800, by Martin von Zweigbergk