dart-lang/spark — pull request #965 by gaurave (2014-02-03 07:53:53+00:00)
Title: Support non-fast-forward merge.

@devoncarew The diff3.js results needs to be addressed slightly. Post that we are very near in supporting merges :)