diff -r 46f4d71ed505 -r 1527f40de3b3 mercurial/ui.py
--- a/mercurial/ui.py	Sat Mar 10 12:45:10 2018 -0500
+++ b/mercurial/ui.py	Sat Mar 10 15:50:09 2018 +0900
@@ -1296,8 +1296,7 @@
                 line = self.fin.readline()
                 if not line:
                     raise EOFError
-                if line.endswith(pycompat.oslinesep):
-                    line = line[:-len(pycompat.oslinesep)]
+                line = line.rstrip(pycompat.oslinesep)
 
         return line