mlt/zandy — comment on commit 6bc5053dde7e278d9c47b3b1508a999f6d0ecc9d
File:  line 0
By mlt:

My intent is to keep master as close to your master as possible and if WinMerge does not lie it is in this state. I was too fast last time by merging fragments into master that was not so ready, so I renamed what used to be master into new fragments branch. I tried to go back a while to create new master. However it turned out that I did not go far enough as most of your chanes did not want to apply clean, so I did it the hard way :-) I feel like I would better recreate my entire master as I'm not sure if I would be able to apply your subsequent commits.