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

Merge pull request #759 from bagerard/bagerard-patch-check-merge-conflict-doc 

Document check-merge-conflict argument
parents 5d1ab6d7 aa56da85
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