Hi Volker, On 2014-12-05, Volker Braun <[email protected]> wrote: > Should work. Perhaps one of the edits in C conflicted with the resolution?
Possibly there is a conflict in some hunks, and of course I don't complain to resolve these. However, "git mergetool" then asked me to resolve *all* hunks, including those that I had resolved before. > You can also try different conflict resolution strategies (man git-merge) Thanks! Simon -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
