clang++ -std=c++0x -stdlib=libc++
This will use the new libc++.
When you encounter a merge conflict with Mercurial, things can get a little disorienting. The following is a practical list of steps to handle a merge conflict without getting lost.
If you want to extend the range of your AirPort Wifi network, you can add more base stations. In the configuration dialogs, the option to “Extend an existing wireless network” is advertised, but this is intended for wirelessly connected base stations. This option affects your network throughput. If you have a wired network between your base stations, you can create a so called “roaming network”, although this is not advertised.