Skip to content
GitLab
Unverified Commit 63e729fc authored by Anthony Sottile's avatar Anthony Sottile Committed by GitHub
Browse files

Merge pull request #301 from vinayinvicible/force-merge 

Added --assume-in-merge option for check-merge-conflict
parents 9bf684c1 64b9f3dc
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 3 deletions
+11 -3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment