comparison tests/test-conflict.out @ 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 5a034646e472
children 7544700fd931
comparison
equal deleted inserted replaced
1804:c3f959c1c3ff 1811:6cb548cffdf5