Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove unused `filtereddata` parameter
authorPhil Cohen <phillco@fb.com>
Fri, 01 Sep 2017 10:35:43 -0700
changeset 34050 b4226ad98366
parent 34049 6330df9d6393
child 34051 d2fc88426d21
simplemerge: remove unused `filtereddata` parameter Differential Revision: https://phab.mercurial-scm.org/D603
contrib/simplemerge file | annotate | diff | comparison | revisions 
--- a/contrib/simplemerge	Fri Sep 01 10:35:43 2017 -0700
+++ b/contrib/simplemerge	Fri Sep 01 10:35:43 2017 -0700
@@ -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))
mercurial