Re: [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces.

From: Johannes Sixt <j6t@kdbg.org>
Date: Jan 29, 2026, 10:04 UTC
Message-ID: <7f45bdc4-d164-42e4-8a84-36410654b4e0@kdbg.org>
In-Reply-To: <AXTzN5mRXdWYZx55ARuBbRgndXW5zA51_wcnAV4KaUpk3kz6t8ZYfOk0Du5rg6zKhz0_O-4ZSkLNX6WkhTp4fjDFDMfCZAsTRCoBMH_IpMU=@proton.me>

Am 29.01.26 um 09:31 schrieb GitHub Chris Idema:

Show 5 quoted lines

>> From: Junio C Hamano <gitster@pobox.com>
>> I noticed that gitk has code to deal with octopus merges
> 
> I would love to know how such a merge can be replicated.
> Is it also possible to have such a merge visible in Git Gui?

This case is not relevant for Git GUI, because it can only show what is in the index. We have only "theirs" and "ours", and together with the current file contents that's a 3-way diff.

-- Hannes

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.