Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-patch.out @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
parents | 0de7e6e27fe4 |
children |
line wrap: on
line source
adding a % check custom patch options are honored requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../a.diff Using custom patch nothing changed