#@ opts.style=diff3
#@ opts.label.ours=HEAD
#@ opts.label.base=BASE
#@ opts.label.theirs=branch
#@ expect.clean=false
#@ expect.conflict_count=1
