diff tests/test-conflict @ 1811:6cb548cffdf5

resync commands.py docstrings with hg.1.txt
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Feb 2006 00:46:06 +0100
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line diff