Fri, 01 Sep 2017 11:52:20 -0700 context: add arbitraryfilectx, which can represent files outside the workdir
Phil Cohen <phillco@fb.com> [Fri, 01 Sep 2017 11:52:20 -0700] rev 34051
context: add arbitraryfilectx, which can represent files outside the workdir Move it from contrib/simplemerge so it can be re-used in the future. Differential Revision: https://phab.mercurial-scm.org/D604
Fri, 01 Sep 2017 10:35:43 -0700 simplemerge: remove unused `filtereddata` parameter
Phil Cohen <phillco@fb.com> [Fri, 01 Sep 2017 10:35:43 -0700] rev 34050
simplemerge: remove unused `filtereddata` parameter Differential Revision: https://phab.mercurial-scm.org/D603
Fri, 01 Sep 2017 10:35:43 -0700 simplemerge: remove unused `repo` parameter
Phil Cohen <phillco@fb.com> [Fri, 01 Sep 2017 10:35:43 -0700] rev 34049
simplemerge: remove unused `repo` parameter This is now no longer used or needed thanks to the `decodeddata()` context function. Differential Revision: https://phab.mercurial-scm.org/D602
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip