mergetools / gvimdiff3on commit Merge branch 'jk/colors' into maint (d544696)
   1. "$MERGE_TOOLS_DIR/vimdiff"