summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-05 21:24:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-05 21:24:52 (GMT)
commit69490f345943f6f6d7ae52e0e9c870e8b48a5dea (patch)
tree2cb4ba93b2a6f409db00730f46c4fe024b82532e /Documentation/git-merge.txt
parente5be297279e8ee8c503eb59da21ab17edc40e748 (diff)
parente45bda876ae2e39ac1e11ba1609f2c363ad4959a (diff)
downloadgit-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.zip
git-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.tar.gz
git-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.tar.bz2
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8c7f2f6..a74c371 100644
--- 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