Merge "Format merge commit messages like C Git"