tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 06 Feb 2007 15:54:58 -0200
changeset 4065 8ee983e3d461
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix strip'ping the second parent of a merge

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)