diff tests/test-merge1.out @ 3156:b1f10d3223c1

dirstate: add copies function rename copies to copymap
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Sep 2006 17:53:17 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff