Mercurial > hg
log
age | author | description |
---|---|---|
Fri, 03 Dec 2021 22:45:35 -0800 | Martin von Zweigbergk | filemerge: inline `_filemerge()` into `filemerge()` |
Fri, 03 Dec 2021 21:41:43 -0800 | Martin von Zweigbergk | filemerge: make `_filemerge()` do both premerge and merge |
Fri, 03 Dec 2021 16:21:46 -0800 | Martin von Zweigbergk | filemerge: merge `premerge()` into `filemerge()` |
Fri, 03 Dec 2021 15:43:54 -0800 | Martin von Zweigbergk | mergestate: inline `_resolve()` into `resolve()` |