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

tests/test-nested-repo.out

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058	e7282dede8cd
parent 2139	74f70f2e08aa
child 5141	d316124ebbea
permissions	-rw-r--r--

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


# should print nothing
# should print ? b/x
? b/x
# should print A b/x
A b/x
# should forget b/x
forgetting b/x
# should print nothing

mercurial-crew-with-dirclash