diff tests/test-merge5 @ 3322:38be819a1225

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