Unity plugin for merging scene files when using git. - View it on GitHub