* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t, conflict_resolver_baton_t): Tweak comments.
  (conflict_resolver): Remove impossible conditions from a test.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1437736 13f79535-47bb-0310-9956-ffa450edef68