Hello Andreas, > As required by git.
What do you mean by that? The user is expected to resolve the conflict, and this implies removing the <<<<<<< and >>>>>>> markers, before doing "git add conflicting-file". In other words: Please give a reproducible recipe for experiencing a problem that occurs without your patch. Please understand that I cannot apply patches that are not accompanied with a sufficiently clear rationale or a "how to reproduce". Thanks. Bruno
