dart-lang/spark — pull request #1200 by gaurave (2014-03-02 03:32:24+00:00)
Title: Add git pull

This add a git pull option to the context menu.

1) The git pull should work for both fast-forward and non-fast forward changes.
2) In case of conflicts it tries to auto resolve them
3) In case git is unable to resolve conflicts, it fails.
4) Upcoming [update status of unmerged files, when the merge fails and add resolve option.]

@devoncarew PTAL thanks