mercurial/mergestate.py
Wed, 05 Aug 2020 13:36:50 -0400 Augie Fackler merge with stable
Tue, 14 Jul 2020 16:40:28 +0530 Pulkit Goyal merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Sat, 01 Aug 2020 18:39:28 +0530 Pulkit Goyal mergestate: fix BC breakage introduced because of removal of a merge record stable 5.5
Thu, 09 Jul 2020 18:43:38 +0530 Pulkit Goyal mergestate: document what mergestate._results is for
Thu, 09 Jul 2020 18:38:09 +0530 Pulkit Goyal mergestate: rename a helpless variable name to bit helpful one
Thu, 09 Jul 2020 18:20:54 +0530 Pulkit Goyal mergestate: remove unnecessary recordactions() from mergestate class
Thu, 09 Jul 2020 17:05:41 +0530 Pulkit Goyal mergestate: document mergestate records in an organized way
Thu, 09 Jul 2020 16:39:42 +0530 Pulkit Goyal mergestate: remove unused unsupported related mergestate records
Thu, 09 Jul 2020 16:38:24 +0530 Pulkit Goyal mergestate: add comments about couple of record types and minor reorder
Thu, 09 Jul 2020 15:50:02 +0530 Pulkit Goyal mergestate: remove unrequired RECORD_RESOLVED_OTHER record
Thu, 09 Jul 2020 14:44:58 +0530 Pulkit Goyal mergestate: rename addpath() -> addpathonflict() to prevent confusion
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
less more (0) tip