Merge branch 'jk/difftool-in-subdir' into next
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"