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

tests/test-issue352.out

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Tue, 06 Feb 2007 15:54:58 -0200
changeset 4065	8ee983e3d461
parent 3607	f4c9bb4ad7b1
child 4181	08d31e43592a
permissions	-rw-r--r--

fix strip'ping the second parent of a merge


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