annotate tests/test-merge4.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 b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source