Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/simplemerge
changeset 34050 b4226ad98366
parent 33906 fa6309c5761d
child 34051 d2fc88426d21 
--- 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