view tests/test-merge4.out @ 2362:482d3fb47d80

Renamed localrepo.undo() to rollback() and talk about "rollback information".
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 01 Jun 2006 19:08:29 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)