Mercurial > public > mercurial-scm > hg

diff contrib/simplemerge @ 37120:a8a902d7176e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
procutil: bulk-replace function calls to point to new module
author Yuya Nishihara <yuya@tcha.org>
date Sat, 24 Mar 2018 15:10:51 +0900
parents d2fc88426d21
children d3e940a32be0
line wrap: on
line diff
--- a/contrib/simplemerge	Sat Mar 24 15:09:33 2018 +0900
+++ b/contrib/simplemerge	Sat Mar 24 15:10:51 2018 +0900
@@ -14,7 +14,9 @@
     fancyopts,
     simplemerge,
     ui as uimod,
-    util,
+)
+from mercurial.utils import (
+    procutil,
 )
 
 options = [('L', 'label', [], _('labels to use on conflict markers')),
@@ -52,7 +54,7 @@
 
 try:
     for fp in (sys.stdin, sys.stdout, sys.stderr):
-        util.setbinary(fp)
+        procutil.setbinary(fp)
 
     opts = {}
     try: