Built-in file merge tool
Would be very handy if it was possible to resolve file conflicts directly in the application window. Like in NetBeans for example: http://www.netbeans.org/images/v6/5/screenshots/cvs-diff.png
Yuzhou Zhu commented
Yes, this feature will be a big plus.
This is strongly needed :)
Yes, please allow editing in the application!
It's clunky to have to switch to XCode, make changes, then diff again in Cornerstone.
Consider the free p4merge program as one example.
The compare view is great! I like it better than FileMerge. I just wish you could edit/merge in that view.