| Index: tools/push-to-trunk/merge_to_branch.py
|
| diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py
|
| index c4450feba68500f991013bc2e36afeade46c1086..399b33c0198f15b2646f9ceb932901b3977215d3 100755
|
| --- a/tools/push-to-trunk/merge_to_branch.py
|
| +++ b/tools/push-to-trunk/merge_to_branch.py
|
| @@ -27,6 +27,8 @@
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| from collections import OrderedDict
|
| +import optparse
|
| +import sys
|
|
|
| from common_includes import *
|
|
|
|
|