Skip to content
Snippets Groups Projects
Commit 34df7cb0 authored by Andreas Gohr's avatar Andreas Gohr Committed by Michael Grosse
Browse files

make merge conflict labels completely customizable

parent a297e675
No related branches found
No related tags found
No related merge requests found
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