Mercurial > hg
graph
-
simplemerge: don't calculate conflict labels when resolving automaticallyTue, 07 Dec 2021 23:01:20 -0800, by Martin von Zweigbergk
-
simplemerge: remove now-unused `localorother` argument from `merge_lines()`Tue, 07 Dec 2021 22:45:31 -0800, by Martin von Zweigbergk