title: Merge two TFS branches with git tfs
body: <p>I'm using <code>git-tfs</code>, and I was wondering if it is possible to merge two TFS branches using <code>git-tfs</code>. I have two branches $/MyCompany/Dev &amp; $/MyCompany/Release-3.3. Release-3.3 originates from the Dev branch. Both are checked out as different git repositories using git tfs.</p>
  
  <p>I'd like to re-incorporate the changes back into the Dev branch. Can this be achieved with <code>git-tfs</code> or will I have to resort to trying to do it using TFS tools?</p>