Fixed output for 'git merge'