Skip to content
Snippets Groups Projects
Commit 98e77491 authored by Florian Heck's avatar Florian Heck
Browse files

Let git merge conflict count reflect the number of conflicts, not just the... 

Let git merge conflict count reflect the number of conflicts, not just the number of conflicting files
parent 6de2af2f
No related branches found
No related tags found
1 merge request!5Changes necessary for JDime wrapper script
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