view tests/test-merge4.out @ 3013:2b255c3478dc

minor docstring fix for revert
author TK Soh <teekaysoh@yahoo.com>
date Tue, 22 Aug 2006 12:20:24 -0500
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)