Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"