> This doesn't look like a conflict merge fix at all. > Oh, I forget this list just pulls out the last message to display when merging a branch; there was a local branch of mine that I merged. There was a 2-line conflict when I went to push because of some changes __dm (Dejan) made just before pushing.
> And do you have any plans on adding the link to windows.php.net again? I'm not sure what link you are talking about?
