Thu, 09 Jul 2020 14:44:58 +0530 | Pulkit Goyal | mergestate: rename addpath() -> addpathonflict() to prevent confusion | file | diff | annotate |
Fri, 05 Jun 2020 11:10:33 -0700 | Martin von Zweigbergk | merge: move an inspection of the dirstate from record to calculate phase | file | diff | annotate |
Thu, 28 May 2020 16:17:28 -0400 | Augie Fackler | mergestate: move staticmethod _filectxorabsent to module level | file | diff | annotate |
Mon, 18 May 2020 14:59:59 -0400 | Augie Fackler | mergestate: split out merge state handling code from main merge module | file | diff | annotate | base |