tests/test-merge4.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 23 Mar 2008 20:37:04 +0100
changeset 6363 bbfebf751ac8
parent 6336 4b0c9c674707
permissions -rw-r--r--
test-imerge: test resolve subcommand

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)