Bug 184837 - KDiff3 should be able to open and save partially merged files
Summary: KDiff3 should be able to open and save partially merged files
Status: REPORTED
Alias: None
Product: kdiff3
Classification: Applications
Component: application (other bugs)
Version First Reported In: unspecified
Platform: Gentoo Packages Linux
: NOR wishlist
Target Milestone: ---
Assignee: michael
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-02-18 20:02 UTC by Thomas Fischer
Modified: 2019-01-16 03:01 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed/Implemented In:
Sentry Crash Report:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Fischer 2009-02-18 20:02:58 UTC 
Version:           0.9.94 (using KDE 4.2.0)
Compiler:          gcc (GCC) 4.2.4 (Gentoo 4.2.4-r1 p1.1) 
OS:                Linux
Installed from:    Gentoo Packages

If a merging process of two files is not yet finished, the user cannot save the current state. How about saving the partially merged text files in a format similar to the conflict format as used by svn? Using such an approach, the merging process can be resumed later.

Example:

some text
<<<<<<<< a.txt
text variant from a.txt
========
text variant from b.txt
>>>>>>>> b.txt
more text