Mercurial > hg-stable
log mercurial/mergestate.py @ 45163:f69253935bf8
| age | author | description |
|---|---|---|
| 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 base mercurial/merge.py@b47619b1eeb3 |