Mercurial > hg
view tests/test-nested-repo.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -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