tests/test-push-hook-lock.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 21 Aug 2007 02:02:08 +0200
changeset 5206 6a1d2dd96b8e
parent 2175 b2ae81a7df29
child 6338 0750f11152fe
permissions -rw-r--r--
abort when adding a file in merged state

adding foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to ../2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files