Merge branch 'js/misc-git-gui-stuff' of ../git-gui
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"