Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict.out @ 748:c5df1a9c5276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0
author mpm@selenic.com
date Thu, 21 Jul 2005 12:40:28 -0500
parents eb46971fc57f
children 7e4843b7efd2
comparison
equal deleted inserted replaced
747:c3ce3976ae75 748:c5df1a9c5276
18 + grep -Ev '>>>|<<<' a 18 + grep -Ev '>>>|<<<' a
19 something else 19 something else
20 ======= 20 =======
21 something 21 something
22 + hg status 22 + hg status
23 C a 23 M a
24 ? .out 24 ? .out