Add git merge UI.
Add git merge.
Merge branch 'master' into git_merge
Add git merge command.
Remove debug messages.
Added comments and indent fixes.
Merge branch 'master' into git_merge
comments.
Merge pull request #3152 from dart-lang/git_merge

Add Git merge