mergetools / gvimdiffon commit Merge branch 'rt/align-add-i-help-text' (c0588fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"