mergetools / vimdiff2on commit Merge branch 'en/t6036-merge-recursive-tests' (e6da45c)
   1. "$MERGE_TOOLS_DIR/vimdiff"