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