diff tests/test-merge-revert2.out @ 3322:38be819a1225

merge: update some docstrings
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:31:02 -0500
parents b2ae81a7df29
children ad6f34c83c3d
line wrap: on
line diff