diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 42391f2ae7..e07337592a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -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