tree 95d4d2c17a794bb1c2a920ac2752eedbeb38bc62
parent b51a8cb05ae989815157d82ed86cfa3a6fbf53fc
author Peter Mounce <pete@neverrunwithscissors.com> 1480000527 +0000
committer Dmitry Lomov <dslomov@google.com> 1480002909 +0000

Prevent merge debris being part of package


Closes #2095.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2095
MOS_MIGRATED_REVID=140134289