Testing Git, 4.
Merge TFS Changeset 20