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.
fix an issue with dart2js and spaces in the path
Add a standalone unittest Dart app.

* Include "json_parser_test" only as a first step.
Merge branch 'master' into git_merge
add linting for release branch names
Add a standalone unittest Dart app.

* Include "json_parser_test" only as a first step.
Merge branch 'unittest-app' of https://github.com/rpaquay/chromedeveditor into unittest-app
resize editor on open
review comments
Merge pull request #3189 from keertip/editor

fix for #3085, resize editor on open
Merge pull request #3176 from devoncarew/devoncarew_add_linting

add linting for release branch names
Merge pull request #3181 from rpaquay/unittest-app

Add simple top level Dart console app for running unit tests.
Merge pull request #3169 from devoncarew/devoncarew_dart2js_spaces

fix an issue with dart2js and spaces in the path
comments.
Merge pull request #3152 from dart-lang/git_merge

Add Git merge