view tests/test-merge3.out @ 4058:e7282dede8cd

filecommit: don't forget the local parent on a merge with a local rename
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 30 Jan 2007 19:09:08 -0200
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed