view tests/test-merge3.out @ 925:5a034646e472

run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed