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

tests/test-nested-repo.out

author	Thomas Arendsen Hein <thomas@intevation.de>
	Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869	ad6f34c83c3d
parent 2139	74f70f2e08aa
child 5141	d316124ebbea
permissions	-rw-r--r--

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.


# 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