Merge branch 'rt/rebase-i-shorten-stop-report'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"