Merge branch 'gj/push-more-verbose-advice'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"