summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorMike Ralphson <mike@abacus.co.uk>2008-08-05 16:12:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-06 04:21:18 (GMT)
commit1168d402d2962f56cbc921bbc954d8f2179c8ba7 (patch)
tree74f6851b69153316af6706004e11c0a1a14ee757 /Documentation/merge-config.txt
parent04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 (diff)
downloadgit-1168d402d2962f56cbc921bbc954d8f2179c8ba7.zip
git-1168d402d2962f56cbc921bbc954d8f2179c8ba7.tar.gz
git-1168d402d2962f56cbc921bbc954d8f2179c8ba7.tar.bz2
Documentation: typos / spelling fixes
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
-rw-r--r--Documentation/merge-config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 48ce747..00277e0 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,5 +1,5 @@
merge.stat::
- Whether to print the diffstat berween ORIG_HEAD and merge result
+ Whether to print the diffstat between ORIG_HEAD and merge result
at the end of the merge. True by default.
merge.log::
@@ -16,7 +16,7 @@ merge.tool::
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
"opendiff". Any other value is treated is custom merge tool
- and there must be a corresponing mergetool.<tool>.cmd option.
+ and there must be a corresponding mergetool.<tool>.cmd option.
merge.verbosity::
Controls the amount of output shown by the recursive merge