bug#18850: smerge-mode: use diff-check-labels

[Lars Ingebrigtsen]

Ivan Shmakov <ivan@siamics.net> writes:

> block 18850 by 18824
> thanks
>
>       Another try.

The patch looks OK to me, and according to the discussion it sounds like
it was ready to be applied, but since that's more than a year ago, and
I'm not an smerge user, I wanted to ask whether the patch is still
something that should go in.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no