Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
From: Johannes Sixt <j6t@xxxxxxxx>
Date: Fri, 11 Jun 2021 18:53:39 +0200
Cc: Jeff King <peff@xxxxxxxx>, David Aguilar <davvid@xxxxxxxxx>, Sergey Organov <sorganov@xxxxxxxxx>, Bagas Sanjaya <bagasdotme@xxxxxxxxx>, Elijah Newren <newren@xxxxxxxxx>, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>, Denton Liu <liu.denton@xxxxxxxxx>, git@xxxxxxxxxxxxxxx, Junio C Hamano <gitster@xxxxxxxxx>
In-reply-to: <60c3724de35b4_3ad920839@natae.notmuch>
References: <20210609192842.696646-1-felipe.contreras@gmail.com> <20210609192842.696646-8-felipe.contreras@gmail.com> <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org> <YMIYUgo71aKJ1Nnx@coredump.intra.peff.net> <xmqqh7i5ci3t.fsf@gitster.g> <638a0500-459a-a25b-afca-904ec0e09866@kdbg.org> <xmqqy2bg3nqw.fsf@gitster.g> <07ef3a3b-4812-4fa1-c60c-b9085a268bc3@kdbg.org> <60c3724de35b4_3ad920839@natae.notmuch>
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0

Am 11.06.21 um 16:25 schrieb Felipe Contreras:
> Personally I have never experienced what you posted, so maybe there's
> something else happening behind the scenes.

I have to do a lot of criss-cross merges lately.

> Maybe merge-ort changed something.

It produces the same result.

-- Hannes

References:
- [PATCH 0/7] Make diff3 the default conflict style
  - From: Felipe Contreras
- [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Felipe Contreras
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Johannes Sixt
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Jeff King
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Junio C Hamano
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Johannes Sixt
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Junio C Hamano
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Johannes Sixt
- Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
  - From: Felipe Contreras

Prev by Date: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
Next by Date: Re: [PATCH v3 3/5] submodule: refrain from filtering GIT_CONFIG_COUNT
Previous by thread: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
Next by thread: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]