tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 02 Nov 2005 15:46:31 -0800
changeset 1487 2bc6cd62a29c
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
fix handling of files of unsupported type in the walk code if a file was of unsupported type, it was considered as 'seen' while walking. this way it was possible to have file in the dirstate not yielded by the walk function.

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)