Merge branch 'js/rebase-r-and-merge-head'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"