git-gui: Do not munge conflict marker lines in a normal diff