equal
deleted
inserted
replaced
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
131 applying tip.patch |
131 applying tip.patch |
132 patching file a |
132 patching file a |
133 Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). |
133 Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). |
134 a |
134 a |
|
135 adding a |
|
136 adding b1 |
|
137 adding c1 |
|
138 adding d |
|
139 diff --git a/a b/a |
|
140 --- a/a |
|
141 +++ b/a |
|
142 @@ -0,0 +1,1 @@ |
|
143 +a |
|
144 diff --git a/b1 b/b2 |
|
145 rename from b1 |
|
146 rename to b2 |
|
147 --- a/b1 |
|
148 +++ b/b2 |
|
149 @@ -0,0 +1,1 @@ |
|
150 +b |
|
151 diff --git a/c1 b/c1 |
|
152 --- a/c1 |
|
153 +++ b/c1 |
|
154 @@ -0,0 +1,1 @@ |
|
155 +c |
|
156 diff --git a/c1 b/c2 |
|
157 copy from c1 |
|
158 copy to c2 |
|
159 --- a/c1 |
|
160 +++ b/c2 |
|
161 @@ -0,0 +1,1 @@ |
|
162 +c |
|
163 diff --git a/d b/d |
|
164 --- a/d |
|
165 +++ b/d |
|
166 @@ -1,1 +0,0 @@ |
|
167 -d |
|
168 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
169 applying empty.diff |
|
170 % a file |
|
171 a |
|
172 % b1 file |
|
173 % b2 file |
|
174 b |
|
175 % c1 file |
|
176 c |
|
177 % c2 file |
|
178 c |
|
179 % d file |