Skip to content
Commit 64b9f3dc authored by Vinay Karanam's avatar Vinay Karanam
Browse files

Added --assume-in-merge option for check-merge-conflict 

Fixes #300
parent 9bf684c1
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