Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"