[PATCH 0 of 2] modify behaviour of --force for merge and commit with subrepos

[Johan Euphrosine]

Hi,

This series of patches modify the behavior of --force for merge and commit involving subrepos.

It allows to do a merge --force and a merge commit if a subrepos is in a dirty state.