Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ralf Wildenhues 2008-09-12 21:10:26 +02:00 коммит произвёл Junio C Hamano
Родитель 06e75d9ac7
Коммит b66e00f12a
3 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -77,7 +77,7 @@ the URLs passed as arguments.
Note about konqueror
--------------------
When 'konqueror' is specified by the a command line option or a
When 'konqueror' is specified by a command line option or a
configuration variable, we launch 'kfmclient' to try to open the HTML
man page on an already opened konqueror in a new tab if possible.

Просмотреть файл

@ -311,7 +311,7 @@ patterns are available:
- `bibtex` suitable for files with BibTeX coded references.
- `java` suitable for source code in the Java lanugage.
- `java` suitable for source code in the Java language.
- `pascal` suitable for source code in the Pascal/Delphi language.

Просмотреть файл

@ -1,5 +1,5 @@
merge.stat::
Whether to print the diffstat between ORIG_HEAD and merge result
Whether to print the diffstat between ORIG_HEAD and the merge result
at the end of the merge. True by default.
merge.log::