title: How to search a git repository history to find a merge error?
body: <p>At some point in our past  branches of development in git were merged.  However, the wrong merge decision was made and therefore some code didn't make it into master branch that we expected would be there.  (There were multiple merges of different branches before a final merge to a master branch.  So the branching and merging history was fairly complex.)</p>
  
  <p>Is there an easy way to search a git repository to determine on which merge the "wrong" decision was made on?</p>
  
  <p>(I already know the answer for this particular case, but the process of finding it was a bit tedious.)</p>
  
  <p>EDIT:  The reason git blame proved inadequate is that the line was touched in a commit sometime after the merge error.  </p>