Mercurial > public > mercurial-scm > hg-stable

diff contrib/simplemerge @ 14233:659f34b833b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename util.set_binary to setbinary
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 06 May 2011 15:25:35 +0200
parents bb9f13974d8e
children cba222f01056
line wrap: on
line diff
--- 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: