mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
70 lines
1.1 KiB
Plaintext
70 lines
1.1 KiB
Plaintext
|
|
# ==== setup repository ====
|
|
% hg init
|
|
adding .hgeol
|
|
adding a.txt
|
|
|
|
% hg clone repo repo-LF
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% printrepr.py a.txt (before)
|
|
first\r
|
|
second\r
|
|
third\r
|
|
% printrepr.py a.txt (after)
|
|
first
|
|
third
|
|
% hg diff
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,2 @@
|
|
first\r
|
|
-second\r
|
|
third\r
|
|
% hg update 0
|
|
merging a.txt
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
% printrepr.py a.txt
|
|
first\r
|
|
third\r
|
|
% hg diff
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,2 @@
|
|
first
|
|
-second
|
|
third
|
|
|
|
% hg clone repo repo-CRLF
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% printrepr.py a.txt (before)
|
|
first\r
|
|
second\r
|
|
third\r
|
|
% printrepr.py a.txt (after)
|
|
first\r
|
|
third\r
|
|
% hg diff
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,2 @@
|
|
first\r
|
|
-second\r
|
|
third\r
|
|
% hg update 0
|
|
merging a.txt
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
% printrepr.py a.txt
|
|
first\r
|
|
third\r
|
|
% hg diff
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,2 @@
|
|
first
|
|
-second
|
|
third
|