Mercurial > hg-stable
graph
-
mergestate: make `_resolve()` do both preresolve and resolveFri, 03 Dec 2021 13:53:02 -0800, by Martin von Zweigbergk
-
mergestate: merge `preresolve()` into `resolve()`Thu, 02 Dec 2021 22:59:36 -0800, by Martin von Zweigbergk
-
tests: remove unnecessary explicit args from `failfilemerge.py`Fri, 03 Dec 2021 21:50:25 -0800, by Martin von Zweigbergk
-
simplemerge: set `conflicts` earlier for :union toolMon, 29 Nov 2021 23:00:29 -0800, by Martin von Zweigbergk
-
typo: s/unkown/unknown across the codebaseFri, 26 Nov 2021 11:53:54 +0100, by Raphaël Gomès
-
rhg: Update the dirstate on disk after statusThu, 25 Nov 2021 18:33:51 +0100, by Simon Sapin