Passing through the ancestor method definition to the PrettyTextDiffBuilder constructor
Merge remote-tracking branch 'origin/master'