tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Wed, 21 Jan 2009 14:14:56 -0600
changeset 7676 43cfbb21f04d
parent 6336 4b0c9c674707
permissions -rw-r--r--
Merge with stable

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