Code

Set merge from trunk