I use "NOMERGE" plus the habit of grepping for it before I merge a branch.