equal
deleted
inserted
replaced
220 +bar |
220 +bar |
221 diff --git a/foo b/baz |
221 diff --git a/foo b/baz |
222 rename from foo |
222 rename from foo |
223 rename to baz |
223 rename to baz |
224 2 baz (foo) |
224 2 baz (foo) |
|
225 diff --git a/bar b/bar |
|
226 new file mode 100644 |
|
227 --- /dev/null |
|
228 +++ b/bar |
|
229 @@ -0,0 +1,1 @@ |
|
230 +bar |
|
231 diff --git a/foo b/baz |
|
232 rename from foo |
|
233 rename to baz |
|
234 2 baz (foo) |
225 |
235 |
226 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
236 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
227 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
237 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
228 adding branch |
238 adding branch |
229 adding changesets |
239 adding changesets |
242 --- /dev/null |
252 --- /dev/null |
243 +++ b/quux |
253 +++ b/quux |
244 @@ -0,0 +1,1 @@ |
254 @@ -0,0 +1,1 @@ |
245 +bar |
255 +bar |
246 3 bleh (foo) |
256 3 bleh (foo) |
|
257 diff --git a/foo b/barney |
|
258 rename from foo |
|
259 rename to barney |
|
260 diff --git a/fred b/fred |
|
261 new file mode 100644 |
|
262 --- /dev/null |
|
263 +++ b/fred |
|
264 @@ -0,0 +1,1 @@ |
|
265 +bar |
|
266 3 barney (foo) |