# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 1504287343 25200
# Node ID b4226ad98366ef2876d01028b179fe7dcf074dea
# Parent  6330df9d6393eeb4ec67c484122086b44cf54cc7
simplemerge: remove unused `filtereddata` parameter

Differential Revision: https://phab.mercurial-scm.org/D603

diff -r 6330df9d6393 -r b4226ad98366 contrib/simplemerge
--- 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))