diff tests/test-merge1.out @ 3957:558f52943cd2

convert-repo: add CVS exec bit support
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Dec 2006 17:59:39 -0600
parents 3109f012c305
children
line wrap: on
line diff