mergetools / gvimdiff2on commit Merge branch 'jk/colors-fix' (e886efd)
   1. "$MERGE_TOOLS_DIR/vimdiff"