view tests/test-merge3.out @ 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 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed