view tests/test-merge2.out @ 9988:ad0a5fb627e6

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Dec 2009 20:10:31 -0600
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head