mergetools / gvimdiff3on commit Merge branch 'jk/still-interesting' into maint (df08eb3)
   1. "$MERGE_TOOLS_DIR/vimdiff"