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

tests/test-nested-repo.out

author	Thomas Arendsen Hein <thomas@intevation.de>
	Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552	bb403d427974
parent 2139	74f70f2e08aa
child 5141	d316124ebbea
permissions	-rw-r--r--

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)


# 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