Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
git-mirror · Sep 5, 2013 · 69490f3 · 69490f3
2 parents e5be297 + e45bda8
commit 69490f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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