merged? Nope. Just the usual svn style of moving stuff around.
Laurent had better not just experimented with git but actually used it. Aside of a small amount of very minor merge conflicts, he would have been able to actually merge.
What he has done, when I'm interpreting the message correctly, is reintroducing all the bugs that were fixed in trunk between the merge point and current head.
I don't blame him though. svn and merges don't go very well together (I hear it got better with 1.5 though)
Laurent had better not just experimented with git but actually used it. Aside of a small amount of very minor merge conflicts, he would have been able to actually merge.
What he has done, when I'm interpreting the message correctly, is reintroducing all the bugs that were fixed in trunk between the merge point and current head.
I don't blame him though. svn and merges don't go very well together (I hear it got better with 1.5 though)