tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 25 Apr 2006 08:37:05 -0700
changeset 2117 760339ccc799
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix issue 217. fall back to fixed path if windows >= nt function not present.

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)