Mercurial > hg
graph
-
filemerge: make `_filemerge()` do both premerge and mergeFri, 03 Dec 2021 21:41:43 -0800, by Martin von Zweigbergk
-
filemerge: merge `premerge()` into `filemerge()`Fri, 03 Dec 2021 16:21:46 -0800, by Martin von Zweigbergk
-
mergestate: inline `_resolve()` into `resolve()`Fri, 03 Dec 2021 15:43:54 -0800, by Martin von Zweigbergk