Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"