[cvsnt] Re: How to get back the local modified file after update?

[Tony Hoyle]

Bo Berglund wrote:

> Now we have the problem that we want to reconstruct the original
> locally modified file (before the update) from the data available
> because this seems to be the one containing the correct solution.
> (Should have been committed....)
>
It's probably too late for you but the -3 option to update could help 
there, since it preserves all 3 files from the merge.  OTOH I'm not 
aware of any graphical diff programs that can examine such diffs.

Tony