Both of these scripts will end up resetting the index to some specific head, and any unresolved merge will be forgotten.
Fix permissions, and add trivial "reset" and "add" scripts. The "reset" script just resets the index back to head, while the "add" script is just a crutch for people used to do "cvs add".
