log

age author description
Mon, 18 Jan 2021 10:24:03 +0100 Pierre-Yves David purge: add a --confirm option
Mon, 11 May 2020 18:45:45 -0400 Augie Fackler filemerge: add a hacktastic version of internal:merge3 for merge diffs
Thu, 28 May 2020 17:31:41 -0400 Augie Fackler rebase: add a config knob for forcing in-memory rebasing
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Fri, 15 Jan 2021 01:20:47 +0100 Joerg Sonnenberger reverse-branch-cache: switch to doubling allocating scheme
Sun, 17 Jan 2021 23:21:33 +0100 Pierre-Yves David discovery: add config options to control sample size
Tue, 19 Jan 2021 00:20:42 +0100 Joerg Sonnenberger exchangev2: avoid second look-up by node
Tue, 19 Jan 2021 00:18:39 +0100 Joerg Sonnenberger commit: look-up new revision once
Tue, 19 Jan 2021 14:00:42 -0800 Martin von Zweigbergk resolve: also detect new :mergediff conflict markers
Mon, 18 Jan 2021 22:32:09 -0800 Martin von Zweigbergk simplemerge: delete unused find_unconflicted()
Fri, 04 Dec 2020 10:11:01 +0100 Pierre-Yves David perf: use the `perf--` prefix for perf command
Tue, 19 Jan 2021 12:22:05 -0500 Augie Fackler merge with stable