Fix merge conflict detection for cherry-pick conflict.
Merge pull request #113 from pre-commit/merge_conflict_detection

Fix merge conflict detection for cherry-pick conflict.