tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix executable bits in t/ scripts
[git.git]
/
Documentation
/
git-merge-file.txt
diff --git
a/Documentation/git-merge-file.txt
b/Documentation/git-merge-file.txt
index c513184ba07ae83073232cc54a0007a3cda66412..149f1310519bb5b732fca0926f786f80a153f8da 100644
(file)
--- a/
Documentation/git-merge-file.txt
+++ b/
Documentation/git-merge-file.txt
@@
-89,4
+89,4
@@
with parts copied from the original documentation of RCS merge.
GIT
---
-Part of the linkgit:git[
7
] suite
+Part of the linkgit:git[
1
] suite