Merge branch 'js/no-pager-shorthand'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"