tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 08 Feb 2008 18:07:55 -0200
changeset 6030 d0dbae32517c
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
revert: revert clean files when only a change of flags is needed

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)