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

[Stefan Monnier]

> @@ -1163,9 +1164,12 @@ repeating the command will highlight other two parts."
>           (let ((status
>                  (apply 'call-process diff-command nil t nil
>                         (append smerge-diff-switches
> -                               (list "-L" (concat name1 "/" file)
> -                                     "-L" (concat name2 "/" file)
> -                                     file1 file2)))))
> +                               (and (diff-check-labels)
> +                                    (list "--label"
> +                                          (concat name1 "/" file)
> +                                          "--label"
> +                                          (concat name2 "/" file)))
> +                               (list file1 file2)))))
>             (if (eq status 0) (insert "No differences found.\n"))))
>         (goto-char (point-min))
>         (diff-mode)

That looks OK, yes.  Tho you don't need to change -L to --label.


        Stefan