tests/test-merge3.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058 e7282dede8cd
parent 1747 91c56c427171
permissions -rw-r--r--
filecommit: don't forget the local parent on a merge with a local rename

removing b
nothing changed