mergetools / gvimdiff2on commit Merge branch 'jn/scripts-updates' (694a88a)
   1. "$MERGE_TOOLS_DIR/vimdiff"