view tests/test-merge5.out @ 2288:dfa17bd1d45e

remove non-prefixed environment variables from hooks.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 15 May 2006 09:13:00 -0700
parents b2ae81a7df29
children 49988d9f0758
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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)