view tests/test-symlinks.out @ 1748:2428e6d66f06

bisect: fix for recent changes disallowing "false" merges
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 19 Feb 2006 18:59:20 +0100
parents 6c61646fee5e
children fd77b7ee4aac
line wrap: on
line source

adding foo
adding bomb
adding a.c
adding dir/a.o
adding dir/b.o
! a.c
! dir/a.o
! dir/b.o
? .hgignore
a.c: unsupported file type (type is fifo)
! a.c