diff tests/test-archive @ 1349:c6295d2a361e

More info on file merge for update --debug
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Sep 2005 14:01:05 -0700
parents 4603eef60237
children 385b06493465 7d83a351a936
line wrap: on
line diff