mergetools / gvimdiff2on commit Merge branch 'js/t4130-rename-without-ino' (3819fb9)
   1. "$MERGE_TOOLS_DIR/vimdiff"