mergetools / gvimdiff3on commit commit_packed_refs(): use a staging file separate from the lockfile (42dfa7e)
   1. "$MERGE_TOOLS_DIR/vimdiff"