view tests/test-merge5.out @ 2093:5cc414722587

convert-repo: fix reversed time zone offset
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 19 Apr 2006 11:29:41 -0700
parents 5c4496ed152d
children b2ae81a7df29
line wrap: on
line source

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