equal
deleted
inserted
replaced
157 --- a/2/base |
157 --- a/2/base |
158 +++ b/2/base |
158 +++ b/2/base |
159 @@ -1,1 +1,1 @@ |
159 @@ -1,1 +1,1 @@ |
160 -base |
160 -base |
161 +patched |
161 +patched |
|
162 % create test repo |
|
163 adding a |
|
164 % capture changes |
|
165 diff --git a/a b/ab |
|
166 copy from a |
|
167 copy to ab |
|
168 --- a/a |
|
169 +++ b/ab |
|
170 @@ -1,1 +1,2 @@ |
|
171 a |
|
172 +b |
|
173 diff --git a/a b/ac |
|
174 copy from a |
|
175 copy to ac |
|
176 --- a/a |
|
177 +++ b/ac |
|
178 @@ -1,1 +1,2 @@ |
|
179 a |
|
180 +c |
|
181 % refresh and check changes again |
|
182 diff --git a/a b/ab |
|
183 copy from a |
|
184 copy to ab |
|
185 --- a/a |
|
186 +++ b/ab |
|
187 @@ -1,1 +1,2 @@ |
|
188 a |
|
189 +b |
|
190 diff --git a/a b/ac |
|
191 copy from a |
|
192 copy to ac |
|
193 --- a/a |
|
194 +++ b/ac |
|
195 @@ -1,1 +1,2 @@ |
|
196 a |
|
197 +c |