Added selcting, pinging and centering the object modified by a merge action. Resolves #11.
Removed merge start button when merging is in progress.
Fixed NullReferenceException when highlighting GameObjects with no scene view open.
Improved handling of components with different values. Made Component.GetPlainType an extension method. Resolves #14.
Update README.md

Added Link to the gh-pages.
Moved project to a Subfolder.
Merge branch 'master' of github.com:FlaShG/GitMerge-for-Unity
Removed optional automatic commit. Instead, we now always automatically mark the file as merged.
Minor UI improvements.
Added repaint on scene change.
Minor UI improvements.
Awesome GUI. Resolves #2.
GUI improvements.
Added ScrollView to MergeAction list.
Added GitMergeAction.inMergePhase. Objects are only highlighted if it is true to prevent highlighting on automatically merged objects. Resolves #20.
Added yellow color to auto-merged stuff, like deleted components. Improved color scheme.
Added highlighting of the left or right button in GitMergeActionChangeValues according to which version is used. Added merge abort when Scripts start to recompile.
Added license file to resources folder.
Added missing meta file. Changed button text, although that has been done in another commit...
Update README.md