With this utility you can:
- resolve scene conflicts when committing content to SVN (tested with TortoiseSVN)
- resolve prefab conflicts
- check for SVN-conflicts prior to executing "SVN Update" (makes it easier to resolve conflicts)
- export scenes as text-files (one GameObject per file, or whole scene hierarchy in a single txt-file)
- compare assets with side-by-side comparison using external diff-tool (tested with WinMerge)
- compare prefabs, scene-subtrees, and whole scenes
- further extend the source code for your needs (whole package is a single .cs file)
For support, usage examples, and video tutorial see: http://www.hf-games.com/scene-diff/
Supports Windows OS, and Unity 3.5 Free/Pro versions.
Mac-support is coming soon!