How to search a git repository history to find a merge error?

Question

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 tha

Answer 1

For others looking for a simpler solution, fire up gitk (or from Git GUI go to Repository > Visualise X History) and use its find tool.