diff: support ^! for merges