Wait for resolving conflicts in merge-to-branch script.
authorulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 20 Sep 2012 08:02:17 +0000 (08:02 +0000)
committerulan@chromium.org <ulan@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Thu, 20 Sep 2012 08:02:17 +0000 (08:02 +0000)
commit9ac3be9670f92a75dab659a7729de1907f49eac4
tree4b33db22ef212e6ed48c1ec4cbdde83b8db45591
parent6f649aaeceebc91ecacfa6458b15aed005d3a667
Wait for resolving conflicts in merge-to-branch script.

R=jkummerow@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10939033

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12560 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
tools/common-includes.sh