mergetools / vimdiff3on commit Merge branch 'sb/t4005-modernize' (46f32fb)
   1. "$MERGE_TOOLS_DIR/vimdiff"