view tests/test-merge5.out @ 1890:d4545f1b8bfa

fix contrib/mercurial.spec for hgext
author Xiaofeng Ling <xiaofeng.ling@intel.com>
date Sun, 12 Mar 2006 15:07:40 +0100
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)