Thu, 05 Jul 2007 13:34:18 -0500 merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 13:34:18 -0500] rev 4815
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip