mercurial-crew-with-dirclash: tests/test-simplemerge.py.out@93a4e72b4f83

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-simplemerge.py.out

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Sat, 28 Apr 2007 17:55:45 -0300
changeset 4385	93a4e72b4f83
parent 4359	2e3c54fb79a3
permissions	-rw-r--r--

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.


....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK

mercurial-crew-with-dirclash

RSS Atom