diff tests/test-merge3 @ 928:6f2c3bcbfaaf

hg incoming/outgoing: fix tests and update man page
author mpm@selenic.com
date Tue, 16 Aug 2005 19:27:46 -0800
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line diff