diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-12 21:10:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-12 13:19:56 -0700 |
| commit | b66e00f12a4e0eef7c9f994db5386e066d726778 (patch) | |
| tree | da1913dd6ddae731ff99ea71612fbeda1d0be3c6 /Documentation/merge-config.txt | |
| parent | 06e75d9ac7d03bb41bb9cd8e236d9dba635d44fd (diff) | |
| download | git-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.gz git-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.xz | |
Fix some manual typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 00277e061..c735788b0 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -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:: |