Thu, 24 Aug 2017 21:30:51 -0700 simplemerge: stop accepting, and passing, file parameters
Phil Cohen <phillco@fb.com> [Thu, 24 Aug 2017 21:30:51 -0700] rev 33924
simplemerge: stop accepting, and passing, file parameters Differential Revision: https://phab.mercurial-scm.org/D381
Thu, 24 Aug 2017 21:30:37 -0700 simplemerge: stop reading from, and writing to, files
Phil Cohen <phillco@fb.com> [Thu, 24 Aug 2017 21:30:37 -0700] rev 33923
simplemerge: stop reading from, and writing to, files We now use contexts first for everything and also pass them everywhere. Differential Revision: https://phab.mercurial-scm.org/D380
Thu, 24 Aug 2017 21:30:37 -0700 simplemerge: use context paths for default labels instead of file paths
Phil Cohen <phillco@fb.com> [Thu, 24 Aug 2017 21:30:37 -0700] rev 33922
simplemerge: use context paths for default labels instead of file paths This is the last place we used the filepath arguments without first using the context version. Differential Revision: https://phab.mercurial-scm.org/D379
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip