My decision to postpone creating a feature branch finally bit me. While I was scratching my head, Nedko implemented some good new stuff in the repository. Long story short: I can only blame myself for needing to go through a bunch of files to manually merge conflicts.
But every cloud has a silver lining, which in this case means that I get to mention a wonderful tool called Kompare. A picture is worth more than a thousand diffs:
I can tell you right now that this baby takes away a lot of hassle from manually merging conflicts. Give it a spin if you can.
So, I'm a bit wiser now. After I'm done with the merge I'll finally upload the new liblash code to a feature branch which I created last night. That should speed things up a little again.