Stash merged file on both roots
Stash merged file on both roots

Leverage stashing option in the [rename] function to properly stash the
current version of a merged file on both roots. This also fixes a
separate bug (using an incorrect path to stash the local merged file).

paulp/unison