tests/test-merge4.out
author Mads Kiilerich <mads@kiilerich.com>
Sun, 21 Jun 2009 03:11:52 +0200
changeset 8901 94319ae527cf
parent 6336 4b0c9c674707
permissions -rw-r--r--
test merge-tools internal:dump and internal:prompt

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)