log mercurial/mergeutil.py @ 46819:d4ba4d51f85f

age author description
Thu, 25 Mar 2021 18:02:08 +0100 Rapha?l Gom?s contributor: change mentions of mpm to olivia
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))