tree a51861e8e03daa1c16cba7cb4f1a33d110b4dd5d
parent 15337078eee6591223c952b0c7a8b356deabf195
author Akron <nils@diewald-online.de> 1485292211 +0100
committer Akron <nils@diewald-online.de> 1485292211 +0100

Warn on use of operation:merge

Change-Id: Ib3764ebcff3222aa0bd18e28e6c3e1ff862bb170