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

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