Build 944: Merge Tool

On a merged file (merged files are shown in magenta color when no confilcts
and in red color for merged with conflicts) invoke CVS | Merge.

--
Valentin Kipiatkov
JetBrains, Inc
http://www.intellij.com
"Develop with pleasure!"

"Jens Voss" <no_mail@jetbrains.com> wrote in message
news:23504761.1065015880271.JavaMail.itn@is.intellij.net...

According to the list of features added in build 944, the
Three-Way Merge Tool is included in that build.
Can you give us a hint on how this works?

>

Thanks in advance,
Jens