view tests/test-nested-repo.out @ 2897:dd032b0f02ac

merge: move forgets to the apply stage
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:30:21 -0500
parents 74f70f2e08aa
children d316124ebbea
line wrap: on
line source

# 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