Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]

| changed conflict --> __change___

As a result, the user thinks that the only __change__ is the import
statement, and elects to resolve the commit in favour of the local
commit. This is the wrong thing to do because the remote hunk is then
lost to the history.