Wait.. we have a senior source control manager and we are using TFS. Sometimes clicking through the gui based wizards to merge two branches is to difficult for C# devs these days. His expertise in right clicking is truly remarkable. I fear for the day we move to distributed source control.
