Parse merge conflict format for multi diffs.

R=johnniwinther@google.com

Review URL: https://codereview.chromium.org//809363002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@42457 260f80e4-7a28-3924-810f-c04153c831b5