Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/maint-diff-temp-smudge'
[gitweb.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index cc0d30fe7e6c96d25304181ef2fdd9cbd02e7817..427ad9083ef4f605728565634ead2b9cc207cb09 100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-41,7
+41,7
@@
include::merge-strategies.txt[]
If you tried a merge which resulted in a complex conflicts and
-w
ould w
ant to start over, you can recover with 'git-reset'.
+want to start over, you can recover with 'git-reset'.
CONFIGURATION
-------------