From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: fr/vimdiff-layout (was: What's cooking in git.git (Mar 2022, #06; Mon, 28))
Date: Tue, 29 Mar 2022 15:59:44 +0200 [thread overview]
Message-ID: <220329.864k3g3lic.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqo81pxzt4.fsf@gitster.g>
On Mon, Mar 28 2022, Junio C Hamano wrote:
> * fr/vimdiff-layout (2022-03-23) 3 commits
> - vimdiff: integrate layout tests in the unit tests framework ('t' folder)
> - vimdiff: add tool documentation
> - vimdiff: new implementation with layout support
>
> Reimplement "vimdiff[123]" mergetool drivers with a more generic
> layout mechanism.
>
> Will merge to 'next'?
> source: <20220319091141.4911-1-greenfoo@u92.eu>
I have no opinion on the topic itself (haven't looked in detail, and I
don't use vim), but FWIW I've gotthis patch to fix the 2x new warnings
on "make check-doc" it triggered:
https://lore.kernel.org/git/patch-1.1-4a5d219dfe7-20220327T131751Z-avarab@gmail.com/
It has a trivial conflict (to that same check!) with my 3e05ff3e147 (CI:
have "static-analysis" run "check-builtins", not "documentation",
2022-03-25) in seen, but perhaps worth picking up...
next prev parent reply other threads:[~2022-03-29 14:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 2:22 What's cooking in git.git (Mar 2022, #06; Mon, 28) Junio C Hamano
2022-03-29 13:58 ` Jeff Hostetler
2022-03-29 13:59 ` Ævar Arnfjörð Bjarmason [this message]
2022-03-29 22:51 ` Neeraj Singh
2022-03-29 23:08 ` Junio C Hamano
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=220329.864k3g3lic.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).