Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 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 | de8ec7e1753a |
children | a11921d24ec4 81078e177266 |