From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
"B. Stebler" <bono.stebler@gmail.com>,
git@vger.kernel.org
Subject: Re: Improving merge of tricky conflicts
Date: Thu, 23 Jul 2020 00:20:46 +0300 [thread overview]
Message-ID: <87tuxzl00h.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqwo2v45hq.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Wed, 22 Jul 2020 14:14:25 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Sergey Organov <sorganov@gmail.com> writes:
>
>> Johannes Sixt <j6t@kdbg.org> writes:
>>
>>> Am 22.07.20 um 01:29 schrieb B. Stebler:
>>>> I have been looking for a tool to display merge conflicts, that instead
>>>> of showing the two versions of the conflicting section, would show the
>>>> diff for that section in both conflicting commits.
>>>
>>> Perhaps you want to configure `merge.conflictStyle=diff3`?
>>
>> Is there 'git merge' command-line option for that? I failed to find one.
>
> There isn't, unless you count
>
> $ git -c merge.conflictstyle=diff3 merge side-branch
>
> as a "command line option" (which may technically is).
Yeah, I thought of maybe making an alias for that, so apparently I do
count it as command line option, thanks!
-- Sergey
next prev parent reply other threads:[~2020-07-22 21:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 23:29 Improving merge of tricky conflicts B. Stebler
2020-07-22 5:50 ` Johannes Sixt
2020-07-22 7:45 ` Jeff King
2020-07-22 17:26 ` Junio C Hamano
2020-07-23 18:25 ` Jeff King
2020-07-24 1:19 ` Junio C Hamano
2020-07-24 19:48 ` Jeff King
2020-07-24 20:18 ` Junio C Hamano
2021-01-16 2:50 ` Martin von Zweigbergk
2021-01-21 14:28 ` Jeff King
2021-01-21 20:30 ` Martin von Zweigbergk
2021-01-21 21:08 ` Jeff King
2020-07-22 20:17 ` Sergey Organov
2020-07-22 21:14 ` Junio C Hamano
2020-07-22 21:20 ` Sergey Organov [this message]
2020-07-23 18:26 ` Jeff King
2020-07-23 19:11 ` Sergey Organov
2020-07-23 21:39 ` Junio C Hamano
2020-07-24 5:15 ` Jacob Keller
2020-07-24 6:01 ` Junio C Hamano
2020-07-24 6:53 ` Sergey Organov
2020-07-24 20:30 ` Junio C Hamano
2020-07-24 22:11 ` Sergey Organov
2020-07-24 23:04 ` Junio C Hamano
2020-07-22 22:48 ` Bono Stebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tuxzl00h.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=bono.stebler@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).