Merge branch 'ac/complete-pull-autostash'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"