On Wed, Dec 23, 2020 at 2:46 PM Junio C Hamano wrote:
>
> Matt Turner writes:
>
> > I want to handle conflicts automatically on lines like
> >
> >> KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv
> >> ~s390 ~sparc ~x86"
> >
> > where conflicts frequently happen by
tl;dr:
I want to handle conflicts automatically on lines like
> KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv
> ~s390 ~sparc ~x86"
where conflicts frequently happen by adding/removing ~ before the
architecture names or adding/removing whole architectures. I don't
