dart-lang/spark — pull request #2370 by gaurave (2014-06-07 06:59:30+00:00)
Title: [Refactor] Refactor git merge

1) Refactor git merge
2) Move tree diff to a Diff command.
3) Add more typing and cleanup

@devoncarew PTAL thanks.