summaryrefslogtreecommitdiffstats
path: root/git-merge-one-file.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
committerJunio C Hamano <junio@kernel.org>2011-07-23 00:51:59 +0000
commit15567bc0c61c951197cb392b835678729534de57 (patch)
tree8be698fd27be92da0c23a77720987071e73b1d69 /git-merge-one-file.txt
parent708376e8576f6d39b62b27ee9dfe7292c652f728 (diff)
downloadgit-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-merge-one-file.txt')
-rw-r--r--git-merge-one-file.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt
index ee059def7..04e803d5d 100644
--- a/git-merge-one-file.txt
+++ b/git-merge-one-file.txt
@@ -8,6 +8,7 @@ git-merge-one-file - The standard helper program to use with git-merge-index
SYNOPSIS
--------
+[verse]
'git merge-one-file'
DESCRIPTION