mergetools / vimdiff3on commit Merge branch 'jk/pretty-encoding-doc' into maint (caac7a3)
   1. "$MERGE_TOOLS_DIR/vimdiff"