Mercurial > hg-stable
log
age | author | description |
---|---|---|
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()` |