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

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 f1af59451c0c
line wrap: on
line diff
--- a/tests/test-586.out	Sun Dec 30 17:45:26 2007 +0100
+++ b/tests/test-586.out	Mon Dec 31 17:47:02 2007 -0600
@@ -10,4 +10,4 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-= b
+C b