Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 48433: (0) -30000 -10000 -3000 -1000 -300 -100 -12 +12 +100 +300 +1000 +3000 tip
age author description
Mon, 06 Dec 2021 12:30:54 -0800 Martin von Zweigbergk filemerge: remove `premerge` argument from `_makebackup()`
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()`
Fri, 03 Dec 2021 13:53:02 -0800 Martin von Zweigbergk mergestate: make `_resolve()` do both preresolve and resolve
Thu, 02 Dec 2021 22:59:36 -0800 Martin von Zweigbergk mergestate: merge `preresolve()` into `resolve()`
Fri, 03 Dec 2021 21:50:25 -0800 Martin von Zweigbergk tests: remove unnecessary explicit args from `failfilemerge.py`
Mon, 29 Nov 2021 23:00:29 -0800 Martin von Zweigbergk simplemerge: set `conflicts` earlier for :union tool
Thu, 25 Nov 2021 18:26:50 +0100 Raphaël Gomès downgrade: don't assume existence of nodemap files when downgrading stable
Fri, 26 Nov 2021 11:53:54 +0100 Raphaël Gomès typo: s/unkown/unknown across the codebase
Thu, 25 Nov 2021 18:33:51 +0100 Simon Sapin rhg: Update the dirstate on disk after status
less more | rev 48433: (0) -30000 -10000 -3000 -1000 -300 -100 -12 +12 +100 +300 +1000 +3000 tip