Plugins/VcsPlugins/vcsMercurial/hg.py

branch
5_4_x
changeset 3275
186e0b3611b3
parent 3245
48311fa7c52c
child 3301
337e119a3bdf
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 15 18:21:59 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Feb 15 19:29:20 2014 +0100
@@ -1743,7 +1743,8 @@
         else:
             output, error = self.__client.runcommand(args)
         
-        return output, error
+        # return file contents with 'universal newlines'
+        return output.replace('\r\n', '\n').replace('\r', '\n'), error
     
     def hgSbsDiff(self, name, extended=False, revisions=None):
         """

eric ide

mercurial