mercurial-crew-with-dirclash: tests/test-issue352.out@e7282dede8cd

tests/test-issue352.out

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058	e7282dede8cd
parent 3607	f4c9bb4ad7b1
child 4181	08d31e43592a
permissions	-rw-r--r--

filecommit: don't forget the local parent on a merge with a local rename


adding he
llo
abort: '\n' and '\r' disallowed in filenames
adding he
llo
abort: '\n' and '\r' disallowed in filenames
hell
o
nothing changed

mercurial-crew-with-dirclash