view tests/test-merge5.out @ 1217:f1895785c79e

Add missing import for hgwebdir
author mpm@selenic.com
date Thu, 08 Sep 2005 00:13:52 -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)