Skip to content
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
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment