From: Johannes Sixt Date: Fri, 29 Nov 2024 07:38:35 GMT Subject: Re: Understanding the diff output in gitk when comparing a commit with working tree Message-ID: In-Reply-To: Am 28.11.24 um 09:27 schrieb tobias.boesch@miele.com: > I found that when comparing a commit with those changes made in the > working tree, I don’t understand the following observations I made > in the diff output for _some_ files: > > - the diff output is not colored in red and green for additions and > removals, but in red and bold black (still preceded with “++”, “+-“, > “--“ and so on) I will assume that there is no merge conflict. Then you see a combined diff where the "first parent" is the index and the "second parent" is the commit that you selected. Without having looked at the code and its history, I guess that this is an accident that nobody has bothered to fix, because it is not a very useful way to show differences between the worktree and a selected commit. -- Hannes