development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source 
You need at least four dashes in a line to have it recognized as listing
block delimiter by asciidoc.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andreas Schwab 2013-09-05 17:12:45 +02:00 committed by Junio C Hamano
parent 6897a64b65
commit e45bda876a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-merge.txt
View file

@ -187,11 +187,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