From: Fernando Ramos <greenfoo@u92•eu>
To: git@vger•kernel.org
Cc: "D . Ben Knoble" <ben.knoble+github@gmail•com>,
Fernando Ramos <greenfoo@u92•eu>,
Junio C Hamano <gitster@pobox•com>,
kawarimidoll <kawarimidoll+git@gmail•com>
Subject: [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE
Date: Tue, 25 Mar 2025 23:23:09 +0100 [thread overview]
Message-ID: <20250325222311.400748-1-greenfoo@u92.eu> (raw)
The "mergetool.vimdiff.layout" config option accepts a "@" marker on one of the
possible targets ("LOCAL", "BASE", "REMOTE" or "MERGED") to specify which window
(or tab or buffer) will be used to overwrite the file which conflicts we are
trying to solve.
The problem is that it never really worked when used with "MERGED" (for all the
others it worked fine).
In this patch series we are fixing that and adding some unit tests to make sure
we never break this again in the future.
Fernando Ramos (2):
mergetools: vimdiff: fix layout where REMOTE is the target
mergetools: vimdiff: add tests for layout with REMOTE as the target
mergetools/vimdiff | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
--
2.49.0
next reply other threads:[~2025-03-25 22:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 22:23 Fernando Ramos [this message]
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 ` [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE Fernando
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=20250325222311.400748-1-greenfoo@u92.eu \
--to=greenfoo@u92$(echo .)eu \
--cc=ben.knoble+github@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kawarimidoll+git@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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