[be] [bug #22949] Merge tool not working properly

[Wolfgang Stradner]

Follow-up Comment #5, bug #22949 (project bibledit):

In BE 3.1.44 the bug I reported is solved.

What I am not sure about is the result of the merge:

Here again the steps to reproduce this:

Testing it out I:
- Created S1, with template:Jude, 
- added 1st verse (Jude, a servant of Christ Jesus and brother of James, to
those who ...), 
- exported Jude.usfm
- created S2, imported Jude.usfm,
(tested: same result, if using: Copying project S1 -> S2).

- changes in S2:
Jude, a servant of Jesus Christ and -> Jesus Christ's servant, called Jude,
who is also a
- changes in S1:
Christ Jesus -> Jesus Christ

The merge dialog shows:
v 1 Jesus Christ's servant, called Jude, who is also a <servant of Jesus
Christ and>|<empty> brother of James, to those who ...

This means, when I choose the option <servant of Jesus Christ and>, the
merge-result would be: 
v 1 Jesus Christ's servant, called Jude, who is also a servant of Jesus
Christ and brother of James, to those who ...

?? Why do both:'Jesus Christ's servant' and 'servant of Jesus Christ' show up
as the merged result? 
Should this be like this (I am not sure, as I am not very  familiar with how
merge should function) or is this a bug?

(file #15540)
    _______________________________________________________

Additional Item Attachment:

File name: Jude.usfm                      Size:0 KB


    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?22949>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/