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