diff tests/test-merge2.out @ 3661:c15c5aedaf47

remove relpath
author Matt Mackall <mpm@selenic.com>
date Wed, 15 Nov 2006 15:51:58 -0600
parents b2ae81a7df29
children
line wrap: on
line diff