log tests/test-merge-local.out @ 3937:ac02810132ca

age author description
Mon, 11 Dec 2006 18:09:52 +0100 Thomas Arendsen Hein Add instructions how to redo/finish failed merge with local working directory.