Fix bug in creating a merge commit.

A merge commit created by `git pull` has 2 parents commits. Add both `local` and `remote` commit as parents.

@devoncarew