Mercurial > hg
graph
-
filemerge: inline `_filemerge()` into `filemerge()`Fri, 03 Dec 2021 22:45:35 -0800, by Martin von Zweigbergk
-
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
-
mergestate: make `_resolve()` do both preresolve and resolveFri, 03 Dec 2021 13:53:02 -0800, by Martin von Zweigbergk
-
mergestate: merge `preresolve()` into `resolve()`Thu, 02 Dec 2021 22:59:36 -0800, by Martin von Zweigbergk
-
tests: remove unnecessary explicit args from `failfilemerge.py`Fri, 03 Dec 2021 21:50:25 -0800, by Martin von Zweigbergk
-
simplemerge: set `conflicts` earlier for :union toolMon, 29 Nov 2021 23:00:29 -0800, by Martin von Zweigbergk