tests/test-nested-repo.out
author Matt Mackall <mpm@selenic.com>
Tue, 08 May 2007 02:59:13 -0500
changeset 4416 bb1800a7d7e1
parent 2139 74f70f2e08aa
child 5141 d316124ebbea
permissions -rw-r--r--
merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

# 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