[find-merge] Show correct merge results, introduce --all flag
[find-merge] Show correct merge results, introduce --all flag

`git-find-merge` wasn't necessarily finding the correct results before.
Fix the logic for merge detection, and add an `--all` flag for when we
need to see the intermediate merges.

kballard/git-scripts