From b66e00f12a4e0eef7c9f994db5386e066d726778 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 12 Sep 2008 21:10:26 +0200 Subject: Fix some manual typos. Signed-off-by: Ralf Wildenhues Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/merge-config.txt') diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 00277e0613..c735788b0f 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:: -- cgit v1.2.3