diff hgmerge @ 4197:b2873c587b1a

branch: require --force to shadow existing branches
author Brendan Cully <brendan@kublai.com>
date Mon, 12 Mar 2007 14:44:14 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff