Mercurial Mercurial > hg / 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 14233 659f34b833b9
parent 8269 bb9f13974d8e
child 19022 cba222f01056 
--- a/contrib/simplemerge	Fri May 06 15:22:31 2011 +0200
+++ b/contrib/simplemerge	Fri May 06 15:25:35 2011 +0200
@@ -43,7 +43,7 @@
 
 try:
     for fp in (sys.stdin, sys.stdout, sys.stderr):
-        util.set_binary(fp)
+        util.setbinary(fp)
     
     opts = {}
     try:
Mercurial