equal
deleted
inserted
replaced
33 new mode 100644 |
33 new mode 100644 |
34 rename from src |
34 rename from src |
35 rename to dst |
35 rename to dst |
36 --- a/src |
36 --- a/src |
37 +++ b/dst |
37 +++ b/dst |
38 @@ -3,3 +3,4 @@ 3 |
38 @@ -3,3 +3,4 @@ |
39 3 |
39 3 |
40 4 |
40 4 |
41 5 |
41 5 |
42 +a |
42 +a |
43 % nonexistent in tip+chmod |
43 % nonexistent in tip+chmod |
84 diff --git a/foo b/bar |
84 diff --git a/foo b/bar |
85 rename from foo |
85 rename from foo |
86 rename to bar |
86 rename to bar |
87 --- a/foo |
87 --- a/foo |
88 +++ b/bar |
88 +++ b/bar |
89 @@ -1,2 +1,3 @@ a |
89 @@ -1,2 +1,3 @@ |
90 a |
90 a |
91 b |
91 b |
92 +c |
92 +c |
93 % reversed |
93 % reversed |
94 diff --git a/bar b/foo |
94 diff --git a/bar b/foo |
95 rename from bar |
95 rename from bar |
96 rename to foo |
96 rename to foo |
97 --- a/bar |
97 --- a/bar |
98 +++ b/foo |
98 +++ b/foo |
99 @@ -1,3 +1,2 @@ a |
99 @@ -1,3 +1,2 @@ |
100 a |
100 a |
101 b |
101 b |
102 -c |
102 -c |
103 |
103 |
104 % file created in r1 and renamed before r2 |
104 % file created in r1 and renamed before r2 |
105 diff --git a/foo b/bar |
105 diff --git a/foo b/bar |
106 rename from foo |
106 rename from foo |
107 rename to bar |
107 rename to bar |
108 --- a/foo |
108 --- a/foo |
109 +++ b/bar |
109 +++ b/bar |
110 @@ -1,1 +1,3 @@ a |
110 @@ -1,1 +1,3 @@ |
111 a |
111 a |
112 +b |
112 +b |
113 +c |
113 +c |
114 % reversed |
114 % reversed |
115 diff --git a/bar b/foo |
115 diff --git a/bar b/foo |
116 rename from bar |
116 rename from bar |
117 rename to foo |
117 rename to foo |
118 --- a/bar |
118 --- a/bar |
119 +++ b/foo |
119 +++ b/foo |
120 @@ -1,3 +1,1 @@ a |
120 @@ -1,3 +1,1 @@ |
121 a |
121 a |
122 -b |
122 -b |
123 -c |
123 -c |
124 |
124 |
125 % file created after r1 and renamed before r2 |
125 % file created after r1 and renamed before r2 |