Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 547:4fc63e22b1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents e94cebc60d96 c8ae964109c1
children eb46971fc57f
comparison
equal deleted inserted replaced
540:53872e2be33a 547:4fc63e22b1fe
52 date: Thu Jan 1 00:00:00 1970 52 date: Thu Jan 1 00:00:00 1970
53 files: a b 53 files: a b
54 description: 54 description:
55 2 55 2
56 56
57
57 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e 58 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
58 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 59 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
59 user: test 60 user: test
60 date: Thu Jan 1 00:00:00 1970 61 date: Thu Jan 1 00:00:00 1970
61 files: a 62 files: a
62 description: 63 description:
63 1 64 1
65
64 66
65 + hg diff 67 + hg diff
66 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' 68 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
67 diff -r 1e71731e6fbb a 69 diff -r 1e71731e6fbb a
68 --- a/a 70 --- a/a