comparison tests/test-conflict.out @ 3914:283ee8971570

doc string fix: hg cat and manifest default to current parent revision.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 16 Dec 2006 22:33:39 +0100
parents b2ae81a7df29
children 46280c004f22
comparison
equal deleted inserted replaced
3913:dbd828167384 3914:283ee8971570