Skip to content
Unverified Commit aa56da85 authored by Bastien Gérard's avatar Bastien Gérard Committed by GitHub
Browse files

Document check-merge-conflict argument 

Document --assume-in-merge in README
parent 5d1ab6d7
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