Mercurial > hg > pyhgsh

diff 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
line wrap: on
line diff
--- a/tests/test-conflict.out	Thu Jul 21 12:29:19 2005 -0500
+++ b/tests/test-conflict.out	Thu Jul 21 12:40:28 2005 -0500
@@ -20,5 +20,5 @@
 =======
 something
 + hg status
-C a
+M a
 ? .out