Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 705:574869103985
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
author | mpm@selenic.com |
---|---|
date | Thu, 14 Jul 2005 22:56:55 -0800 |
parents | 204328d345f1 b266e92bcd0b |
children | c5df1a9c5276 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -57,7 +57,6 @@ description: 2 - changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test @@ -67,7 +66,6 @@ description: 1 - + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r 1e71731e6fbb a