* ch04.xml:  rewrite repeated-merge section, and describe how to   resurrected deleted data.
* ch04.xml:  rewrite repeated-merge section, and describe how to
  resurrected deleted data.

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