diff tests/test-merge7 @ 3661:c15c5aedaf47

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