Code

merge script: refuse to merge during merge