On the 1.7.x-r1438879 branch, merge r1438879, resolving conflicts.

* subversion/svn/conflict-callbacks.c
  (show_diff): This function expects svn_wc_conflict_description_t in 1.7.x,
   not svn_wc_conflict_description2_t as it does on trunk. Some struct members
   have changed names in the second revision of the struct but contain the
   same data. Use appropriate names to access these members.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1438879@1438883 13f79535-47bb-0310-9956-ffa450edef68