Here is a sample of conflict:
return std::read_line( cin );
m_archive >> line;
This tool read this kind of file, and detect the conflicting block. The local file (the one you updated/merged into) is shown on the left window, the revision that was merged into the file is shown on the right window.
Here is a screen shot, showing a file containing two conflicts:
The marks in the margin show the conflicting block. The yellow color indicates the selected conflict block. You can navigate through the conflicts using the up arrow and the down arrow icons in the toolbar. The icons with two small arrows facing each other is used to scroll both window to the selected conflict.
The right window is read only, you can not modify the text in it (but you can copy to the clipboard). You solve the conflict in the left window, by editing the text, using cut and past, and the two strange icons near the printer icons in the toolbar.
Once you solved the conflict, save the file.
CVS Conflict Editor 1.1.0
install [180Ko] (include setup executable & documentation file
CVS Conflict Editor 1.1.0 source code [274Ko] (Zip file).
CVS Conflict Editor 1.0 install
[180Ko] (include setup executable & documentation file readme.txt).
CVS Conflict Editor 1.0 source code [313Ko] (Zip file).
I'll set up a project on sourceforge (http://www.sourceforge.net) as soon as I can. Please wait until it's done before sending bug reports or feature requests. On sourceforge there will be the proper support do to this.
If you want to help, you can mail me a name suggestion for the project, as well of a summary of what it is doing (my English is weird, and I'd like to find a good summary of 1 or 2 sentences).
I'll post an update on my page as soon as the project is set up on sourceforge.
You can reach me at the following address: email@example.com