Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
http_get_file: style fixes
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index 8c7f2f66d86e5d41113d6158b496068cc6b72bce..a74c3713c6e60db404cbca5afeeebfe687012f58 100644
(file)
--- 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