Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2:
Documentation/git-merge.txt: fix formatting of example block

diff --combined Documentation/git-merge.txt
index 8c7f2f66d86e5d41113d6158b496068cc6b72bce,e07337592ae5c4dca30bca770f55e4096ce1df6d..a74c3713c6e60db404cbca5afeeebfe687012f58
--- 1/Documentation/git-merge.txt
--- 2/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -56,8 -56,8 +56,8 @@@ especially if those changes were furthe
  was started), 'git merge --abort' will in some cases be unable to
  reconstruct the original (pre-merge) changes. Therefore:
  
 -*Warning*: Running 'git merge' with uncommitted changes is
 -discouraged: while possible, it leaves you in a state that is hard to
 +*Warning*: Running 'git merge' with non-trivial uncommitted changes is
 +discouraged: while possible, it may leave you in a state that is hard to
  back out of in the case of a conflict.
  
  
@@@ -76,7 -76,8 +76,7 @@@ The 'git fmt-merge-msg' command can b
  used to give a good default for automated 'git merge'
  invocations.
  
 ---rerere-autoupdate::
 ---no-rerere-autoupdate::
 +--[no-]rerere-autoupdate::
        Allow the rerere mechanism to update the index with the
        result of auto-conflict resolution if possible.
  
@@@ -186,11 -187,11 +186,11 @@@ In such a case, you can "unwrap" the ta
  to `git merge`, or pass `--ff-only` when you do not have any work on
  your own. e.g.
  
- ---
+ ----
  git fetch origin
  git merge v1.2.3^0
  git merge --ff-only v1.2.3
- ---
+ ----
  
  
  HOW CONFLICTS ARE PRESENTED