comparison tests/fish-merge @ 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 0902ffece4b4
children
comparison
equal deleted inserted replaced
1865:1ed809a2104e 1867:91ebf29c1595