tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Mon, 26 Apr 2010 11:02:11 -0500
changeset 10991 11569b997f81
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