From: Fernando <greenfoo@u92.eu>
To: git@vger.kernel.org
Cc: "D . Ben Knoble" <ben.knoble+github@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
kawarimidoll <kawarimidoll+git@gmail.com>
Subject: Re: [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE
Date: Wed, 26 Mar 2025 11:10:24 +0100 [thread overview]
Message-ID: <7a4d6f02-50a5-4b1b-9d19-9598e66b6f34@app.fastmail.com> (raw)
In-Reply-To: <20250325222311.400748-1-greenfoo@u92.eu>
> The problem is that it never really worked when used with "MERGED" (for all the
> others it worked fine).
Sorry, I meant "REMOTE" instead of "MERGED".
This is a typo in the cover letter.
The rest of the patch series is OK.
prev parent reply other threads:[~2025-03-26 10:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 22:23 [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE Fernando Ramos
2025-03-25 22:23 ` [PATCH 1/2] mergetools: vimdiff: fix layout where REMOTE is the target Fernando Ramos
2025-03-29 0:23 ` D. Ben Knoble
2025-03-29 20:46 ` Junio C Hamano
2025-03-25 22:23 ` [PATCH 2/2] mergetools: vimdiff: add tests for layout with REMOTE as " Fernando Ramos
2025-03-26 10:10 ` Fernando [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7a4d6f02-50a5-4b1b-9d19-9598e66b6f34@app.fastmail.com \
--to=greenfoo@u92.eu \
--cc=ben.knoble+github@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kawarimidoll+git@gmail.com \
/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.
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 NNTP newsgroup(s).