D603: simplemerge: remove unused `filtereddata` parameter
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Sep 1 18:22:42 UTC 2017
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D603
AFFECTED FILES
contrib/simplemerge
CHANGE DETAILS
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))
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list