Merge branch 'rj/git-version-gen-do-not-force-abbrev'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"