Merge branch 'fc/rerere-conflict-style'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"