#103 Move detailed information about external merge tool configuration from Chapter 2 to Chapter 7.

[Anonymous]

Originally created by: cmpilato
Originally owned by: cmpilato

The section "Resolving conflict differences interactively" in Chapter 2 goes a little too deep for my tastes, and should instead provide a high-level overview with a pointer to more detailed bits in Chapter 7 ("External merge" or somesuch, ala "External diff" and "External diff3").

[Anonymous]

Originally posted by: cmpilato

FIXED:
   Sending        book/ch02-basic-usage.xml
   Sending        book/ch07-customizing-svn.xml
   Transmitting file data ..
   Committed [r3909].

Status: Fixed