Merge branch 'ls/travis-submitting-patches' into HEAD
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"