view tests/test-nested-repo.out @ 3305:e7abcf3a7c5f

filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -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