Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo.out @ 3296:4546a5e31cb8
Use filelog.cmp in checkfilemerge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 20:18:59 -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