tests/test-nested-repo.out
author Matt Mackall <mpm@selenic.com>
Mon, 02 Oct 2006 12:04:48 -0500
changeset 3233 3fd098e0902d
parent 2139 74f70f2e08aa
child 5141 d316124ebbea
permissions -rw-r--r--
merge: extend file merge function for 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