tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 04 Mar 2009 19:04:20 -0600
changeset 7824 0b5c7c239d29
parent 6336 4b0c9c674707
permissions -rw-r--r--
Added tag 1.2 for changeset 11efa41037e2

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)