Mercurial > hg-stable
graph
-
filemerge: make `_filemerge()` do both premerge and mergeFri, 03 Dec 2021 21:41:43 -0800, by Martin von Zweigbergk
-
filemerge: merge `premerge()` into `filemerge()`Fri, 03 Dec 2021 16:21:46 -0800, by Martin von Zweigbergk
-
mergestate: inline `_resolve()` into `resolve()`Fri, 03 Dec 2021 15:43:54 -0800, by Martin von Zweigbergk
-
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
-
rhg: Add Repo::write_dirstateThu, 02 Dec 2021 15:10:03 +0100, by Simon Sapin
-
rhg: Add lazy/cached dirstate data file ID parsing on RepoThu, 02 Dec 2021 12:05:36 +0100, by Simon Sapin
-
rhg: Make Repo::dirstate_parents a LazyCellMon, 29 Nov 2021 19:00:11 +0100, by Simon Sapin
-
rust: Add Vfs::write_atomicMon, 29 Nov 2021 18:46:04 +0100, by Simon Sapin
-
rhg: Initial repository lockingMon, 22 Mar 2021 09:07:10 +0100, by Simon Sapin