Mercurial > hg

diff mercurial/filemerge.py @ 30636:f1c9fafcbf46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.environ with encoding.environ (part 3 of 5)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Dec 2016 01:54:36 +0530
parents c2154979409d
children 4d019d0e1b3b
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sun Dec 18 01:46:39 2016 +0530
+++ b/mercurial/filemerge.py	Sun Dec 18 01:54:36 2016 +0530
@@ -16,6 +16,7 @@
 from .node import nullid, short
 
 from . import (
+    encoding,
     error,
     formatter,
     match,
@@ -165,7 +166,7 @@
                 return (force, force)
 
     # HGMERGE takes next precedence
-    hgmerge = os.environ.get("HGMERGE")
+    hgmerge = encoding.environ.get("HGMERGE")
     if hgmerge:
         if changedelete and not supportscd(hgmerge):
             return ":prompt", None