+1 for the integrated visual merge. Does anybody knows if IDEA uses the builtin CVS or VSS diff tool or IntelliJ own? Because if IntelliJ got there own it would not be too hard to create a merge tool. However real nice merge tools do 3 way merge (Ancestor, Mod1, Mod2) that would be a little harder.
Jacques "John Murph" <[EMAIL PROTECTED]> wrote in message ahhe0j$mu5$[EMAIL PROTECTED]">news:ahhe0j$mu5$[EMAIL PROTECTED]... > How would this be pioneering? I know that SlickEdit has had it for some > time. I suspect others have as well. Still, something like this would be > nice. Along with a visual merge tool (could be same viewer/editor as the > diff tool). > > > "Paul Ruane" <[EMAIL PROTECTED]> wrote in message > news:[EMAIL PROTECTED]... > > > > A pioneering feature for an IDE would be the option for editting of a > versioned file against the check-out or repository version. > > > > After an initial diff, the repository version would be shown with added > lines marked with different background colour, deleted lines shown in > strike-through etc. (customizable). The file > > could then be editted, new lines inserted, lines deleted an undeleted etc. > > > > Potentially, a toolbar option would switch between traditional and "diff" > editting. > > > > Paul. > > > > > > -- > > > > This e-mail may contain confidential and/or privileged information. If you > are not the intended recipient (or have received this e-mail in error) > please notify the sender immediately and destroy this e-mail. Any > unauthorized copying, disclosure or distribution of the material in this > e-mail is strictly forbidden. > > > > > > _______________________________________________ Eap-features mailing list [EMAIL PROTECTED] http://lists.jetbrains.com/mailman/listinfo/eap-features
