Mercurial > hg

diff tests/test-merge-prompt.out @ 5762:c2a21fe60994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"C" status code considered harmful, so changed to "=" (issue899) C means conflict in other SCMs, and = is more intuitive anyway.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 30 Dec 2007 17:45:26 +0100
parents 8a65ea986755
children 8a5d8fb59ed2
line wrap: on
line diff
--- a/tests/test-merge-prompt.out	Sun Dec 30 17:36:49 2007 +0100
+++ b/tests/test-merge-prompt.out	Sun Dec 30 17:45:26 2007 +0100
@@ -7,7 +7,7 @@
 (branch merge, don't forget to commit)
 status:
 M file2
-C file1
+= file1
 file1:
 1
 changed
@@ -23,7 +23,7 @@
 (branch merge, don't forget to commit)
 status:
 file2: No such file or directory
-C file1
+= file1
 file1:
 1
 changed
@@ -57,7 +57,7 @@
 failed
 status:
 file2: No such file or directory
-C file1
+= file1
 file1:
 1
 changed