tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Sat, 17 Sep 2005 00:37:14 -0700
changeset 1271 9ab14ca22e37
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Fix ignore regression. An empty or non-existent hgignore file must return False (don't ignore) for everything.

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)