diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
| commit | 2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch) | |
| tree | 1f66627398f37b23ec3af2697514d33d25060d96 /git-merge-index.txt | |
| parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
| download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz | |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-merge-index.txt')
| -rw-r--r-- | git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-index.txt b/git-merge-index.txt index 4d266de9c..921b38f18 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- -'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*) +'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*) DESCRIPTION ----------- |