Index: ch02-basic-usage.xml =================================================================== --- ch02-basic-usage.xml (revision 3839) +++ ch02-basic-usage.xml (working copy) @@ -2565,7 +2565,7 @@ - An example Tree Conflict + An Example Tree Conflict Suppose a software project you were working on currently looked like this: