| Summary: | KDiff3 should be able to open and save partially merged files | ||
|---|---|---|---|
| Product: | [Applications] kdiff3 | Reporter: | Thomas Fischer <fischer> |
| Component: | application | Assignee: | michael <reeves.87> |
| Status: | REPORTED --- | ||
| Severity: | wishlist | CC: | reeves.87 |
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | Gentoo Packages | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
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