mergetools / gvimdiff2on commit Merge branch 'cb/byte-order' into maint (1fbc6e6)
   1. "$MERGE_TOOLS_DIR/vimdiff"