Kaleidoscope 4.2
In the window title bar you’ll see a new element that gives you more detail about the task. You’ll see how many conflicts you still need to resolve in that file.
[…]
The window has a new area between the title bar and the Path Bar. We call it Context Shelf. […] In the middle, depending on the conflict type (did you really expect Git to only have one?), you’ll see a description of what you are dealing with (a merge in this case) and which refs are involved. We will also try show you branch names when available.
[…]
Finally, the Path Bar above the text views has been tweaked to outline exactly what content is shown where.
Another solid update.
Previously:
