Mercurial > hg
diff tests/test-issue660.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 | f252ba975925 |
children | 8a5d8fb59ed2 |
line wrap: on
line diff
--- a/tests/test-issue660.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-issue660.out Sun Dec 30 17:45:26 2007 +0100 @@ -32,8 +32,8 @@ R a R b/b % commit -C a/a -C b += a/a += b % long directory replaced with file adding d/d/d % should fail - would corrupt dirstate @@ -42,8 +42,8 @@ % should succeed - shadow removed % update should work at least with clean workdir 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -C a -C b/b += a += b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -C a/a -C b += a/a += b