Mercurial > hg

diff tests/test-merge-prompt.out @ 5764:8a5d8fb59ed2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset c2a21fe60994 Unfortunately, this breaks backward compatibility.
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Dec 2007 17:47:02 -0600
parents c2a21fe60994
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-merge-prompt.out	Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-merge-prompt.out	Mon Dec 31 17:47:02 2007 -0600
@@ -7,7 +7,7 @@
 (branch merge, don't forget to commit)
 status:
 M file2
-= file1
+C file1
 file1:
 1
 changed
@@ -23,7 +23,7 @@
 (branch merge, don't forget to commit)
 status:
 file2: No such file or directory
-= file1
+C file1
 file1:
 1
 changed
@@ -57,7 +57,7 @@
 failed
 status:
 file2: No such file or directory
-= file1
+C file1
 file1:
 1
 changed