Sync with maint

* maint: Documentation/git-merge.txt: fix formatting of example block
2013-09-05 14:41:40 -07:00 · 2013-09-05 14:41:40 -07:00 · d2dbd399fa
parent 57e4c1783f 2ea3df68e8
commit d2dbd399fa
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