Teach @{-1} to git merge