comparison mercurial/localrepo.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 8e503fa54d2d
children fc389dcc33f5 0403b80352c9
comparison
equal deleted inserted replaced
4798:452d171a1b39 4815:8808ea7da86b