mergetools / gvimdiffon commit commit: avoid race when creating orphan commits (a933c23)
   1. "$MERGE_TOOLS_DIR/vimdiff"