Regular file without conflicts when Diff

• Current branch [HEAD] is on the left
• Merge result is on the right (editable)

A file with conflicts

• Current branch [HEAD] is on the right
• The branch with code taken in [MERGE_HEAD] is on the left
• Merge result is at bottom (editable)

The Confusion

The TortoiseGit UI above is a bit confusing, when a file having conflicts,
the current branch HEAD should still be on the left.