Merge branch 'po/rerere-doc-fmt'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"