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

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

Revert "Let git merge conflict count reflect the number of conflicts, not just the number of conflicting files"

The git merge gives no guarantees about the exit code (contrary to git merge-file)

This reverts commit 98e77491.
parent 98e77491
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment