view tests/test-eol-add.out @ 11697:efcdf6a953a0

Merge with stable

# ==== setup repository ====
% hg init
adding a.txt

% hg clone repo repo-LF
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% hg add .hgeol
% hg status
A .hgeol
% hg commit
% hg status
% hg tip -p
changeset:   1:34614fc6dc02
tag:         tip
user:        test
date:        Thu Jan 01 00:03:20 1970 +0000
summary:     Added .hgeol file

diff --git a/.hgeol b/.hgeol
new file mode 100644
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,5 @@
+[patterns]
+**.txt = native
+
+[repository]
+native = LF


% hg clone repo repo-CRLF
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% hg add .hgeol
% hg status
M a.txt
A .hgeol
% hg commit
% hg status
% hg tip -p
changeset:   1:4bbdacd3fe39
tag:         tip
user:        test
date:        Thu Jan 01 00:03:20 1970 +0000
summary:     Added .hgeol file

diff --git a/.hgeol b/.hgeol
new file mode 100644
--- /dev/null
+++ b/.hgeol
@@ -0,0 +1,5 @@
+[patterns]
+**.txt = native
+
+[repository]
+native = CRLF
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,3 @@
-first
-second
-third
+first\r
+second\r
+third\r