log mercurial/mergestate.py @ 45095:8e04607023e5

age author description
Fri, 05 Jun 2020 11:10:33 -0700 Martin von Zweigbergk merge: move an inspection of the dirstate from record to calculate phase
Thu, 28 May 2020 16:17:28 -0400 Augie Fackler mergestate: move staticmethod _filectxorabsent to module level
Mon, 18 May 2020 14:59:59 -0400 Augie Fackler mergestate: split out merge state handling code from main merge module base mercurial/merge.py@b47619b1eeb3