Mercurial > hg

changeset 34050:b4226ad98366

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: remove unused `filtereddata` parameter Differential Revision: https://phab.mercurial-scm.org/D603
author Phil Cohen <phillco@fb.com>
date Fri, 01 Sep 2017 10:35:43 -0700
parents 6330df9d6393
children d2fc88426d21
files contrib/simplemerge
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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))