pre_commit_hooks/check_merge_conflict.py · 64b9f3dcf0dcd16ec6011fc9111b3fd81e16fd80 · ExternalRepo / pre-commit-hooks · 极狐GitLab

查找文件 Blame History Permalink

Added --assume-in-merge option for check-merge-conflict · 64b9f3dc
由 Vinay Karanam 创作于 6月 26, 2018
```
Fixes #300
```
64b9f3dc