Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 48473: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 tip
age author description
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
less more | rev 48473: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 tip