Bug 87538 - last character lost when resolving conflicts with cervisia
Summary: last character lost when resolving conflicts with cervisia
Status: RESOLVED DUPLICATE of bug 46871
Alias: None
Product: cervisia
Classification: Applications
Component: general (show other bugs)
Version: 2.1
Platform: unspecified Linux
: NOR normal
Target Milestone: ---
Assignee: Christian Loose
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-08-19 20:55 UTC by Robin Rosenberg
Modified: 2004-08-19 21:38 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:

Attachments
Sample file with conflicts in it (233 bytes, text/plain)
2004-08-19 21:04 UTC, Robin Rosenberg 		Details
View All Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Robin Rosenberg 2004-08-19 20:55:20 UTC 
Version:           2.1 (using KDE 3.2 BRANCH >= 20040204, Mandrake Linux Cooker i586 - Cooker)
Compiler:          gcc version 3.3.2 (Mandrake Linux 10.0 3.3.2-6mdk)
OS:                Linux (i686) release 2.6.3-15mdk

When using cervisia's built-in editor while resolving differences it drops the last character of every line

In the resolution window I see this text for version A
#, fuzzy, c-format
msgid "Encapsulation:"
msgstr "Krypteringsnyckel"

When selecting Edit I get an editor with this text
#, fuzzy, c-forma
msgid "Encapsulation:
msgstr "Krypteringsnyckel
Comment 1 Robin Rosenberg 2004-08-19 21:04:56 UTC 
Created attachment 7185 [details]
Sample file with conflicts in it
Comment 2 Christian Loose 2004-08-19 21:38:12 UTC 
Fix in KDE 3.2.3 and upcoming KDE 3.3.

*** This bug has been marked as a duplicate of 46871 ***