Skip to content

Commit

Permalink
Sync with maint
Browse files Browse the repository at this point in the history 
* maint:
  Documentation/git-merge.txt: fix formatting of example block
  • Loading branch information
Junio C Hamano committed Sep 5, 2013
2 parents 57e4c17 + 2ea3df6 commit d2dbd39
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-merge.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d2dbd39

Please sign in to comment.