Review: Change mergeParent to trackingBranch

Matches what RBTools calls it.

Testing Done: Created a review
Bug Number: none
Reviewed by: trivial