tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 16 Nov 2009 14:50:24 -0600
changeset 9870 f6a2dbbb0776
parent 6336 4b0c9c674707
permissions -rw-r--r--
Added tag 1.4 for changeset 31ec469f9b55

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)