Use $EDITOR for editing unmerged changes.

Or try defaulting to sublime text.