summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-01-19 00:37:50 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-01-19 00:37:50 +0000
commit7c73c663897cfb2796fa93efc40ebe4ea33a3db1 (patch)
tree1f9d377ee80bb9eada67fc063f87c517dffa8832 /git-merge-one-file.txt
parent2d47c62a3df350dff294aba379e2a5430fd130d1 (diff)
downloadgit-htmldocs-7c73c663897cfb2796fa93efc40ebe4ea33a3db1.tar.gz
Autogenerated HTML docs for v1.5.0-rc1-g72fe
Diffstat (limited to 'git-merge-one-file.txt')
-rw-r--r--git-merge-one-file.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt
index 86aad37c6..f80ab3b8c 100644
--- a/git-merge-one-file.txt
+++ b/git-merge-one-file.txt
@@ -3,7 +3,7 @@ git-merge-one-file(1)
NAME
----
-git-merge-one-file - The standard helper program to use with "git-merge-index"
+git-merge-one-file - The standard helper program to use with git-merge-index
SYNOPSIS