view tests/test-merge8.out @ 7350:c5dbe86b0fee

inotify: fix replacing a folder with a file (issue1375)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 11 Nov 2008 23:16:59 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved