Mercurial > hg
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()` |
Tue, 07 Dec 2021 22:33:18 -0800 | Martin von Zweigbergk | simplemerge: add a specialized function for "union", "local", "other" |
Sat, 18 Dec 2021 11:47:03 +0100 | Simon Sapin | rhg: Fall back to Python if verbose status is requested by config |
Fri, 17 Dec 2021 17:56:13 +0100 | Simon Sapin | rhg: Accept different "invalid ignore pattern" error message formatting |
Fri, 17 Dec 2021 16:54:22 +0100 | Simon Sapin | rhg: Properly format warnings related to ignore patterns |