Fix bug in creating a merge commit.
comments.
Merge pull request #3138 from dart-lang/git_merge_error

Fix bug in creating a merge commit.