mergetools / vimdiff2on commit Merge branch 'tq/t1510' (3138f23)
   1. "$MERGE_TOOLS_DIR/vimdiff"