[MERGE] Use correct index when emitting conflicted-b (fixes #196780)

[Aaron Bentley]

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

Hi all,

This patch fixes a silly copy+paste error I made in the LCA merge algorithm.

If it determines that a line was involved in conflict, and that conflict
was resolved in two different ways, it is supposed to mark the line as
"conflicted-b" in the merge plan.  Instead, it uses the wrong index into
the line list, thereby marking some arbitrary line as "conflicted-b", or
raising an IndexError if the index is too great.

This patch changes it to use the right index.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHyqek0F+nu1YWqI0RAuWJAJ0QODJduqEqQ+YQhi/ycqfkxouH3wCdF16h
Rbh9ZhHrN4X1+r2vura5s/Y=
=8Qmw
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-GQ6PcA.patch
Type: text/x-diff
Size: 4798 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080302/43bbb787/attachment.bin