OSDN Git Service

Merge branch 'sp/doc-info-attributes'
[git-core/git.git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"