Add failing test.
Fixes crash during merge conflict.  Closes #82.
Simplify has_unmerged_paths
Merge pull request #83 from pre-commit/merge_conflict_crash_82

Merge conflict crash 82