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

tests/test-nested-repo.out

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903	013921c753bd
parent 2139	74f70f2e08aa
child 5141	d316124ebbea
permissions	-rw-r--r--

merge with other head by default, not tip. fixes issue 339.


# 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