Skip to content
Commit 0b36e8ec authored by Jason Chu's avatar Jason Chu
Browse files

Add a message that explains what to do when a merge conflict is detected and... 

Add a message that explains what to do when a merge conflict is detected and needs to be dealt with.
parent f71a0fab
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment