Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
2013-09-05 14:24:52 -07:00 · 2013-09-05 14:24:52 -07:00 · 69490f3459
parent e5be297279 e45bda876a
commit 69490f3459
1 changed files with 2 additions and 2 deletions
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@ -186,11 +186,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
 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