Merge branch 'es/worktree-forced-ops-fix'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"