Mercurial > hg
comparison tests/test-mq.out @ 5762:c2a21fe60994
"C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 30 Dec 2007 17:45:26 +0100 |
| parents | 61c230f81068 |
| children | 8a5d8fb59ed2 |
comparison
equal
deleted
inserted
replaced
| 5761:07df2a5c02b2 | 5762:c2a21fe60994 |
|---|---|
| 367 +++ b/fred | 367 +++ b/fred |
| 368 @@ -0,0 +1,1 @@ | 368 @@ -0,0 +1,1 @@ |
| 369 +bar | 369 +bar |
| 370 3 barney (foo) | 370 3 barney (foo) |
| 371 % refresh omitting an added file | 371 % refresh omitting an added file |
| 372 C newfile | 372 = newfile |
| 373 A newfile | 373 A newfile |
| 374 Now at: bar | 374 Now at: bar |
| 375 % create a git patch | 375 % create a git patch |
| 376 diff --git a/alexander b/alexander | 376 diff --git a/alexander b/alexander |
| 377 % create a git binary patch | 377 % create a git binary patch |