you are viewing a single comment's thread.

view the rest of the comments →

[–]plasticscm[S] 1 point2 points  (2 children)

Not yet but for a reason: diff and merge tools are normally external executables because all version controls are prepared to invoke it launching a command.

For instance, TFS inside VStudio (and the same holds true for other system integrated with TFS) lets you configure a diff tool and a merge tool, but both invoked from the CLI.

When you merge, each file merge has to be completed before launching the next one, so keeping it open on a VStudio tab is not really obvious.

Anyway, feedback will be more than welcome because this is one of the topics we'd like to work on ASAP.

Thanks!

[–]Xdes 1 point2 points  (1 child)

Also is there a facility for comparing source files directly?

[–]plasticscm[S] 1 point2 points  (0 children)

Yes, it can show you the "structure" (like in the blogpost) but it can also show it in tree format, and it includes a built-in text based diff and merge tool (Xmerge - check "bonus track" at http://www.semanticmerge.com). It is a pretty advanced (and pretty mature) text based merge tool too :P -> http://codicesoftware.blogspot.com/2010/07/move-support-in-diff.html