bug:

error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.

解决方法：

git config --global core.editor $(which vim)