diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-01-04 22:06:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-01-04 22:06:18 +0000 |
| commit | 7165bf798c79fef70904e15d0d487e713bd25ac1 (patch) | |
| tree | 3f1e20a921f1bb3f3dc8350d2716405b634964a4 /git-merge.html | |
| parent | 3609b339c5cf80a09d3c619ae11c8263463f361c (diff) | |
| download | git-htmldocs-7165bf798c79fef70904e15d0d487e713bd25ac1.tar.gz | |
Autogenerated HTML docs for v1.7.4-rc0-5-gf2665
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index ba52c86db..1f1ffb886 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1113,7 +1113,7 @@ merge.log In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the
actual commits that are being merged. Defaults to false, and
- true is a synoym for 20.
+ true is a synonym for 20.
</p>
</dd>
<dt class="hdlist1">
|