Patchwork D603: simplemerge: remove unused `filtereddata` parameter

login
register
mail settings
Submitter phabricator
Date Sept. 1, 2017, 8:58 p.m.
Message ID <89c49a304a46a808c62f4bbf222189bc@localhost.localdomain>
Download mbox | patch
Permalink /patch/23606/
State Not Applicable
Headers show

Comments

phabricator - Sept. 1, 2017, 8:58 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG872d20fca015: simplemerge: remove unused `filtereddata` parameter (authored by phillco).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D603?vs=1542&id=1558

REVISION DETAIL
  https://phab.mercurial-scm.org/D603

AFFECTED FILES
  contrib/simplemerge

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/simplemerge b/contrib/simplemerge
--- a/contrib/simplemerge
+++ b/contrib/simplemerge
@@ -88,7 +88,6 @@ 
                                      filebackedctx(local),
                                      filebackedctx(base),
                                      filebackedctx(other),
-                                     filtereddata=True,
                                      **opts))
 except ParseError as e:
     sys.stdout.write("%s: %s\n" % (sys.argv[0], e))