tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 12 Nov 2008 09:08:43 +0100
changeset 7351 5ab0abf27dd9
parent 6336 4b0c9c674707
permissions -rw-r--r--
Backed out changeset c5dbe86b0fee (issue1375)

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)