Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge3.out @ 1867:91ebf29c1595
add -f/--force to remove command.
else to remove modified file, must use "hg revert; hg rm"
or "rm; hg rm --after".
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 08 Mar 2006 15:14:24 -0800 |
parents | 91c56c427171 |
children |