No matches were found for subject:"Bug#426938\: git\-core\: Conflict markers should always have a SHA1"