comparison 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
comparison
equal deleted inserted replaced
5762:c2a21fe60994 5764:8a5d8fb59ed2
8 adding file changes 8 adding file changes
9 added 1 changesets with 1 changes to 1 files (+1 heads) 9 added 1 changesets with 1 changes to 1 files (+1 heads)
10 (run 'hg heads' to see heads, 'hg merge' to merge) 10 (run 'hg heads' to see heads, 'hg merge' to merge)
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit) 12 (branch merge, don't forget to commit)
13 = b 13 C b