Mercurial > hg
diff tests/test-import-eol.out @ 10102:1720d70cd6d4
patch: implement patch.eol=auto mode
EOLs in patched files are restored to their original value after
patching. We use the first EOL found in the file, files with
inconsistent EOLs will thus be normalized during this process.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 20 Dec 2009 17:18:04 +0100 |
parents | 6c9dce20ed70 |
children | d8214e944b84 |
line wrap: on
line diff
--- a/tests/test-import-eol.out Sun Dec 20 17:18:02 2009 +0100 +++ b/tests/test-import-eol.out Sun Dec 20 17:18:04 2009 +0100 @@ -10,6 +10,13 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying eol.diff 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' +% auto EOL on LF file +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +applying eol.diff +'a\nyyyy\ncc\n\nd\ne' +% auto EOL on CRLF file +applying eol.diff +'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' adding b % binary patch with --eol applying bin.diff