Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: talk about guts of merge in tutorial.
[gitweb.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 1b99f2b3cdd939964c275a202ffa71dc5d1b8f44..d072fdaa4f74a6508abcae17001b1321c73bb000 100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-1,6
+1,5
@@
git-merge-index(1)
==================
-v0.1, May 2005
NAME
----
@@
-85,5
+84,5
@@
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
-Part of the
link:git.html[git
] suite
+Part of the
gitlink:git[7
] suite