# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1177793745 10800
# Node ID f9cd48bd8625b0f0837e7a37a1cba4db310cad4e
# Parent  93a4e72b4f83ccebe1c7d3f2c5d049379de323be
Fix minor mismerge.

The caching of umask ended up being duplicated.

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -764,9 +764,6 @@ def checkfolding(path):
     except:
         return True
 
-_umask = os.umask(0)
-os.umask(_umask)
-
 def checkexec(path):
     """
     Check whether the given path is on a filesystem with UNIX-like exec flags