comparison tests/test-merge6.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 5007e0bdeed2
comparison
equal deleted inserted replaced
927:5a830d7bea52 928:6f2c3bcbfaaf