Merge branch 'fr_v2.28.0_rnd1' of github.com:jnavila/git
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"