view tests/test-merge2.out @ 10862:f97b98db6fd1

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 17:48:48 -0500
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