diff tests/test-pull-permission.out @ 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 937ee88da3ef
children 3053fc33f545
line wrap: on
line diff