Fri, 03 Dec 2021 16:21:46 -0800 | Martin von Zweigbergk | filemerge: merge `premerge()` into `filemerge()` | changeset | files |
Fri, 03 Dec 2021 15:43:54 -0800 | Martin von Zweigbergk | mergestate: inline `_resolve()` into `resolve()` | changeset | files |
Fri, 03 Dec 2021 13:53:02 -0800 | Martin von Zweigbergk | mergestate: make `_resolve()` do both preresolve and resolve | changeset | files |
Thu, 02 Dec 2021 22:59:36 -0800 | Martin von Zweigbergk | mergestate: merge `preresolve()` into `resolve()` | changeset | files |
Fri, 03 Dec 2021 21:50:25 -0800 | Martin von Zweigbergk | tests: remove unnecessary explicit args from `failfilemerge.py` | changeset | files |
Mon, 29 Nov 2021 23:00:29 -0800 | Martin von Zweigbergk | simplemerge: set `conflicts` earlier for :union tool | changeset | files |
Thu, 25 Nov 2021 18:26:50 +0100 | Raphaël Gomès | downgrade: don't assume existence of nodemap files when downgrading | changeset | files |