tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 14 Apr 2010 09:08:47 +0200
branchstable
changeset 10902 4eb6311d217a
parent 6336 4b0c9c674707
permissions -rw-r--r--
run-tests.py: reset env variables set by hooks

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)