##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Merge with stable
Steve Borho -
r12318:d643ae55 merge default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,69 +1,69
1 1
2 2 # ==== setup repository ====
3 3 % hg init
4 4 adding .hgeol
5 5 adding a.txt
6 6
7 7 % hg clone repo repo-LF
8 8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9 9 % printrepr.py a.txt (before)
10 10 first\r
11 11 second\r
12 12 third\r
13 13 % printrepr.py a.txt (after)
14 14 first
15 15 third
16 16 % hg diff
17 17 diff --git a/a.txt b/a.txt
18 18 --- a/a.txt
19 19 +++ b/a.txt
20 20 @@ -1,3 +1,2 @@
21 21 first\r
22 22 -second\r
23 23 third\r
24 24 % hg update 0
25 25 merging a.txt
26 26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
27 27 % printrepr.py a.txt
28 first\r
29 third\r
28 first
29 third
30 30 % hg diff
31 31 diff --git a/a.txt b/a.txt
32 32 --- a/a.txt
33 33 +++ b/a.txt
34 34 @@ -1,3 +1,2 @@
35 35 first
36 36 -second
37 37 third
38 38
39 39 % hg clone repo repo-CRLF
40 40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 41 % printrepr.py a.txt (before)
42 42 first\r
43 43 second\r
44 44 third\r
45 45 % printrepr.py a.txt (after)
46 46 first\r
47 47 third\r
48 48 % hg diff
49 49 diff --git a/a.txt b/a.txt
50 50 --- a/a.txt
51 51 +++ b/a.txt
52 52 @@ -1,3 +1,2 @@
53 53 first\r
54 54 -second\r
55 55 third\r
56 56 % hg update 0
57 57 merging a.txt
58 58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59 59 % printrepr.py a.txt
60 first\r
61 third\r
60 first
61 third
62 62 % hg diff
63 63 diff --git a/a.txt b/a.txt
64 64 --- a/a.txt
65 65 +++ b/a.txt
66 66 @@ -1,3 +1,2 @@
67 67 first
68 68 -second
69 69 third
General Comments 0
You need to be logged in to leave comments. Login now