comparison hgmerge @ 788:64d2a558c943

add note about -C to update message
author mpm@selenic.com
date Sat, 30 Jul 2005 08:30:12 -0800
parents 4fc63e22b1fe
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
787:f199e1887889 788:64d2a558c943