view tests/test-merge2.out @ 5574:d4ec6d61b3ee

imported patch rev-help
author Matt Mackall <mpm@selenic.com>
date Sun, 02 Dec 2007 15:25:37 -0600
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b