Resolve issue #1743: Inconsistent expansion of $Id$ keyword.
Resolve issue #1743: Inconsistent expansion of $Id$ keyword.

* subversion/libsvn_wc/update_editor.c
  (merge_file): Check whether we have keywords. This may require
   retranslation regardless of content or magic props changes.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion