dart-lang/spark — pull request #1082 by devoncarew (2014-02-13 00:11:02+00:00)
Title: Devoncarew resolve conflicts

Not yet ready for review - @gaurave, I have some TODOs here where I'll need some implementation to call, either at the scm layer or in the git layer underneath it.