Merge branch 'nd/files-backend-git-dir' into next
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"