Fix type error in getShaForData util funciton.
Fix type error bug in objectstore.
fix type bug in fetch.
Fix type error in merge.
fix type error in getShaForData.
rename sha => shaBytes in TreeEntry.
fix line splitter in diff3 command.
minor fixes.
Add functionality to commit a given tree.
git merge changes.
Merge branch 'master' into fix_git_merge
Write intermediate objects while git merge.
clean debug messages.
Merge branch 'master' into ladoo

Conflicts:
	ide/app/lib/git/utils.dart
Merge pull request #998 from dart-lang/fix_git_merge

Fix git merge