mergetools / gvimdiff3on commit Merge branch 'jk/sanity' (4b16573)
   1. "$MERGE_TOOLS_DIR/vimdiff"