[rfc] conflicts in merge sometimes looks strange

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I try to understand how bzr produce conflict texts.
Sometimes during merge there is very strange conflicts. Per example:

 self.log.clear()
 <<<<<<< TREE
 libgame.dll.get_game_log(libgame.LogVariant['ELOG_normal'], bufgamelog)
 self.log.add_game_log(bufgamelog.value)
 ||||||| BASE-REVISION
 =======
 libgame.dll.get_game_log(libgame.LogVariant['ELOG_normal'], bufgamelog)
 self.log.add('game_log: ' + bufgamelog.value)
 >>>>>>> MERGE-SOURCE
 self.log.add_line(linenum, line)


There is added 2 lines in both branches, but actual conflict only in second
line, because only second line differs. But bzr show both lines in conflict.

Why?


Alexander

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFbXMUzYr338mxwCURAkKNAJ4jj78hmuIE97jta8cTXfJjSnybawCfeIMl
tIq/sySnB8Gs77udxwggdUc=
=4nga
-----END PGP SIGNATURE-----