log

age author description
Tue, 18 Jan 2022 10:27:13 +0100 Raphaël Gomès branching: merge with stable
Thu, 30 Dec 2021 13:25:44 +0100 Dan Villiom Podlaski Christiansen rust: fix build errors on darwin stable
Mon, 17 Jan 2022 12:50:13 +0100 Simon Sapin rust: Fix outdated comments in OwningDirstateMap
Fri, 14 Jan 2022 09:28:44 -0800 Martin von Zweigbergk merge: consider the file merged when using :merge-{local,other}
Fri, 14 Jan 2022 08:44:36 -0800 Martin von Zweigbergk simplemerge: delete unused exception class `CantReprocessAndShowBase`
Tue, 11 Jan 2022 22:13:56 -0800 Martin von Zweigbergk simplemerge: change _minimize() to minimize a single conflict
Tue, 11 Jan 2022 22:03:55 -0800 Martin von Zweigbergk simplemerge: make minimize() a free function
Tue, 11 Jan 2022 21:56:27 -0800 Martin von Zweigbergk simplemerge: simplify and rename `render_markers()`