tests/test-merge4.out
author Cédric Duval <cedricduval@free.fr>
Sun, 21 Jun 2009 17:18:48 +0200
changeset 8877 08636e18268f
parent 6336 4b0c9c674707
permissions -rw-r--r--
extensions: check for path existence only when necessary

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)