view tests/test-cat.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 7544700fd931
children
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1