Merge branch 'rr/feed-real-path-to-editor'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"