Skip to content
Verified Commit e40b0a0b authored by Nick Curtis's avatar Nick Curtis
Browse files

make conflict detection smarter

parent a9b7447f
Hide whitespace changes
Inline Side-by-side
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