view tests/test-issue1438.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 2c5b2abfb8be
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying bad.patch
R link
? bad.patch