Merge pull request #423 from hedrok/fix-advanced-merging-issues

Fix small issues in advanced-merging

Author: ben

book/07-git-tools/sections/advanced-merging.asc

@@ -493,7 +493,7 @@ index 0399cd5,59727f0..0000000
 This shows us that ``hola world'' was in our side but not in the working copy, that ``hello mundo'' was in their side but not in the working copy and finally that ``hola mundo'' was not in either side but is now in the working copy.
 This can be useful to review before committing the resolution.
 
-You can also get this from the `git log` for any merge after the fact to see how something was resolved after the fact.
+You can also get this from the `git log` for any merge to see how something was resolved after the fact.
 Git will output this format if you run `git show` on a merge commit, or if you add a `--cc` option to a `git log -p` (which by default only shows patches for non-merge commits).
 
 [source,console]
@@ -622,7 +622,7 @@ First of all, there is another useful thing we can do with the normal ``recursiv
 We've already seen the `ignore-all-space` and `ignore-space-change` options which are passed with a `-X` but we can also tell Git to favor one side or the other when it sees a conflict.
 
 By default, when Git sees a conflict between two branches being merged, it will add merge conflict markers into your code and mark the file as conflicted and let you resolve it.
-If you would prefer for Git to simply choose a specific side and ignore the other side instead of letting you manually merge the conflict, you can pass the `merge` command either a `-Xours` or `-Xtheirs`.
+If you would prefer for Git to simply choose a specific side and ignore the other side instead of letting you manually resolve the conflict, you can pass the `merge` command either a `-Xours` or `-Xtheirs`.
 
 If Git sees this, it will not add conflict markers.
 Any differences that are mergeable, it will merge.