Skip to content
Snippets Groups Projects
Commit 1cc346ce authored by Joel Nothman's avatar Joel Nothman Committed by Tom Dupré la Tour
Browse files

BUILD Give clear error message when there are merge conflicts (#8945)

parent a2db2a02
No related branches found
No related tags found
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