--- a/mercurial/filemerge.py Wed Nov 13 20:42:13 2019 +0100
+++ b/mercurial/filemerge.py Sun Dec 01 18:46:10 2019 -0500
@@ -279,7 +279,7 @@
def _eoltype(data):
- b"Guess the EOL type of a file"
+ """Guess the EOL type of a file"""
if b'\0' in data: # binary
return None
if b'\r\n' in data: # Windows
@@ -292,7 +292,7 @@
def _matcheol(file, back):
- b"Convert EOL markers in a file to match origfile"
+ """Convert EOL markers in a file to match origfile"""
tostyle = _eoltype(back.data()) # No repo.wread filters?
if tostyle:
data = util.readfile(file)