view tests/test-merge5.out @ 1104:98988cc3723a

Fix dirstate imports
author mpm@selenic.com
date Sat, 27 Aug 2005 16:42:03 -0700
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)