Fix log message typo in git:merge