mergetools / gvimdiffon commit Merge branch 'en/merge-cleanup' (74bb463)
   1. "$MERGE_TOOLS_DIR/vimdiff"