log

age author description
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()))