mergetools / vimdiff3on commit Merge branch 'jk/colors' (7a1aa0c)
   1. "$MERGE_TOOLS_DIR/vimdiff"