view tests/test-install.out @ 3869:ad6f34c83c3d

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
parents 8cbf060f637e
children
line wrap: on
line source

Checking encoding (ascii)...
Checking extensions...
Checking templates...
Checking patch...
Checking merge helper...
Checking commit editor...
Checking username...
No problems detected