tests/test-merge4.out
author Alexander Solovyov <piranha@piranha.org.ua>
Sat, 18 Oct 2008 18:05:56 +0200
changeset 7131 23bd7383891c
parent 6336 4b0c9c674707
permissions -rw-r--r--
commands: optional options where possible This makes life a lot easier on API users.

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)