view tests/test-push-hook-lock.out @ 11346:e740f36cfb4b

tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 13:39:00 -0400
parents a3d73b3e1f8a
children
line wrap: on
line source

adding foo
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating to branch default
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