tests/test-nested-repo.out
author Matt Mackall <mpm@selenic.com>
Thu, 21 Jun 2007 18:02:03 -0500
changeset 4674 723e0ddb6ada
parent 2139 74f70f2e08aa
child 5158 d316124ebbea
permissions -rw-r--r--
merge: warn user about divergent renames

# 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