bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up

[Eli Zaretskii]

> From: Spencer Baugh <sbaugh@janestreet.com>
> Cc: sbaugh@catern.com,  monnier@iro.umontreal.ca,  64071@debbugs.gnu.org
> Date: Wed, 04 Oct 2023 10:05:26 -0400
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> >> From: sbaugh@catern.com
> >> Date: Sat, 19 Aug 2023 12:32:01 +0000 (UTC)
> >> Cc: Spencer Baugh <sbaugh@janestreet.com>, monnier@iro.umontreal.ca,
> >>    64071@debbugs.gnu.org
> >> 
> >> Eli Zaretskii <eliz@gnu.org> writes:
> >> >> From: Spencer Baugh <sbaugh@janestreet.com>
> >> >> Cc: monnier@iro.umontreal.ca,  64071@debbugs.gnu.org
> >> >> Date: Wed, 28 Jun 2023 08:48:38 -0400
> >> >> 
> >> >> > See above: we shouldn't change the read-only attribute that was set by
> >> >> > the user.
> >> >> 
> >> >> Good point.  How about this?
> >> >
> >> > Better, thanks.
> >> 
> >> Is this patch OK to apply, then?
> >
> > Yes, I think so.
> 
> Could it be applied, then?

Installed on master, and closing the bug.