> > > you have to do it manually i'm afraid. if git mergetool does not help, > maybe some visual diffs like 'meld' would solve it. > > Always nice to have your prompt and friendly advice, even when it's bad news :-).
I'll fix it then, because I've become quite used to my expression-taker. Shall I, after I fixed and tested that merge redacted into master? Or would Dave like to test things? Yours, Kas.
