summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-09-12 19:10:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-12 20:19:56 (GMT)
commitb66e00f12a4e0eef7c9f994db5386e066d726778 (patch)
treeda1913dd6ddae731ff99ea71612fbeda1d0be3c6 /Documentation/merge-config.txt
parent06e75d9ac7d03bb41bb9cd8e236d9dba635d44fd (diff)
downloadgit-b66e00f12a4e0eef7c9f994db5386e066d726778.zip
git-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.gz
git-b66e00f12a4e0eef7c9f994db5386e066d726778.tar.bz2
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e0..c735788 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::