diff mercurial/context.py @ 6685:76021ec849c8

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 15 Jun 2008 13:05:39 +0200
parents 0c611355481b d286ec1bdcff
children fec6bc978843
line wrap: on
line diff
--- a/mercurial/context.py	Sat Jun 14 16:01:24 2008 +0200
+++ b/mercurial/context.py	Sun Jun 15 13:05:39 2008 +0200
@@ -538,7 +538,7 @@
         is_exec = util.execfunc(self._repo.root,
                                 lambda p: flag and 'x' in flag)
         try:
-            return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
+            return (is_link(path) and 'l' or '') + (is_exec(path) and 'x' or '')
         except OSError:
             pass