Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
GIT 1.6.3-rc4
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index 427ad9083ef4f605728565634ead2b9cc207cb09..c04ae739edd409307d286fe31e6f87e41f977eac 100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-40,7
+40,7
@@
include::merge-options.txt[]
include::merge-strategies.txt[]
-If you tried a merge which resulted in
a
complex conflicts and
+If you tried a merge which resulted in complex conflicts and
want to start over, you can recover with 'git-reset'.
CONFIGURATION