mergetools / gvimdiff2on commit Merge branch 'jk/still-interesting' (fbdeabf)
   1. "$MERGE_TOOLS_DIR/vimdiff"