Mercurial > hg
graph
-
simplemerge: make merge_lines() a free functionFri, 07 Jan 2022 22:16:22 -0800, by Martin von Zweigbergk
-
simplemerge: convert `merge_lines()` away from generatorFri, 07 Jan 2022 18:42:31 -0800, by Martin von Zweigbergk
-
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labelsTue, 14 Dec 2021 13:12:56 -0800, by Martin von Zweigbergk