Mon, 06 Dec 2021 12:30:54 -0800 | Martin von Zweigbergk | filemerge: remove `premerge` argument from `_makebackup()` | changeset | files |
Fri, 03 Dec 2021 22:45:35 -0800 | Martin von Zweigbergk | filemerge: inline `_filemerge()` into `filemerge()` | changeset | files |
Fri, 03 Dec 2021 21:41:43 -0800 | Martin von Zweigbergk | filemerge: make `_filemerge()` do both premerge and merge | changeset | files |
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 |