Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
694:51eb248d3348 | 705:574869103985 |
---|---|
55 files: a b | 55 files: a b |
56 description: | 56 description: |
57 2 | 57 2 |
58 | 58 |
59 | 59 |
60 | |
61 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | 60 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
62 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | 61 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
63 user: test | 62 user: test |
64 date: Thu Jan 1 00:00:00 1970 | 63 date: Thu Jan 1 00:00:00 1970 |
65 files: a | 64 files: a |
66 description: | 65 description: |
67 1 | 66 1 |
68 | |
69 | 67 |
70 | 68 |
71 + hg diff | 69 + hg diff |
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | 70 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
73 diff -r 1e71731e6fbb a | 71 diff -r 1e71731e6fbb a |