global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync with maint

Browse Source 
* maint:
  Documentation/git-merge.txt: fix formatting of example block
This commit is contained in:
Junio C Hamano
2013-09-05 14:41:40 -07:00
parent 57e4c1783f 2ea3df68e8
commit d2dbd399fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge.txt
View File

@@ -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