tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 25 Jun 2007 11:29:17 -0700
changeset 4714 a741293793f6
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Make changeset_printer respect ui diffopts

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)