gitextensions/gitextensions — pull request #1386 by feinstaub (2012-10-30 20:58:13+00:00)
Title: Suggestion: new image set to help new users to solve merge conflicts

Merging and rebasing are great but when conflicts occur I often find myself struggling to find out which branch the .REMOTE and .LOCAL files in the merge tool (kdiff3) refer to.

Therefore attached you find a set of new images (all in one for quick review). They could be added to the "solve conflicts" dialog and could also replace the current corresponding images in the Pull / Merge / Rebase dialogs.