Mercurial > hg-stable
log
age | author | description |
---|---|---|
Fri, 10 Dec 2021 15:22:24 +0100 | pacien | rust: add vcsgraph crate as dependency |
Tue, 07 Dec 2021 23:01:20 -0800 | Martin von Zweigbergk | simplemerge: don't calculate conflict labels when resolving automatically |
Tue, 07 Dec 2021 22:45:31 -0800 | Martin von Zweigbergk | simplemerge: remove now-unused `localorother` argument from `merge_lines()` |
Tue, 07 Dec 2021 22:33:18 -0800 | Martin von Zweigbergk | simplemerge: add a specialized function for "union", "local", "other" |