Add hooks at key places to allow a system of unclobering potential merge conflicts so repositories can be cloned over existing files.
Merged branch that places hooks at key points to deal with merge issues instead of hard coding my unclobber method into vcsh.