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.

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

Make clone actually fallback to import instead of just importing.

See merge request !3

included as subprojects?

Change package structure

See merge request !2

Revert reporting merges with conflicts as failed

See merge request !1

This reverts commit ef56db95

This reverts commit 44992289, reversing
changes made to 9e3e2f64.

Florian Heck authored 7 years ago and Georg Seibt committed 7 years ago

fix strange handling of curly braces by the ProcessBuilder by wrapping them in quotes