File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ the URLs passed as arguments.
77
77
Note about konqueror
78
78
--------------------
79
79
80
- When 'konqueror' is specified by the a command line option or a
80
+ When 'konqueror' is specified by a command line option or a
81
81
configuration variable, we launch 'kfmclient' to try to open the HTML
82
82
man page on an already opened konqueror in a new tab if possible.
83
83
Original file line number Diff line number Diff line change @@ -311,7 +311,7 @@ patterns are available:
311
311
312
312
- `bibtex` suitable for files with BibTeX coded references.
313
313
314
- - `java` suitable for source code in the Java lanugage .
314
+ - `java` suitable for source code in the Java language .
315
315
316
316
- `pascal` suitable for source code in the Pascal/Delphi language.
317
317
Original file line number Diff line number Diff line change 1
1
merge.stat::
2
- Whether to print the diffstat between ORIG_HEAD and merge result
2
+ Whether to print the diffstat between ORIG_HEAD and the merge result
3
3
at the end of the merge. True by default.
4
4
5
5
merge.log::
You can’t perform that action at this time.
0 commit comments