tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 26 Oct 2006 19:25:45 +0200
changeset 3554 da3ee7ca620f
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
add untrusted argument to patch.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)