diff hgmerge @ 1435:22b44fd9a166

add --no-merges (-M) for log, outgoing, incoming
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 24 Oct 2005 15:37:20 -0700
parents 696851b1bba9
children 64a1169c927d
line wrap: on
line diff