diff tests/test-up-local-change.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 fffc8a733bf9
children 17ed9b9a0d03
line wrap: on
line diff