summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorShawn Bohrer <shawn.bohrer@gmail.com>2007-09-26 04:12:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-26 06:38:42 (GMT)
commitb06743925c3022ffbbd459431531709df13bbf38 (patch)
treea8155b8bd320aa4b06c57a5eab91ddecc44176e3 /Documentation/git-merge.txt
parent4d84aff356d9c6d86a8d621ee577283ed70e145e (diff)
downloadgit-b06743925c3022ffbbd459431531709df13bbf38.zip
git-b06743925c3022ffbbd459431531709df13bbf38.tar.gz
git-b06743925c3022ffbbd459431531709df13bbf38.tar.bz2
Fix spelling of overridden in documentation
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 144bc16..eae49c4 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -56,7 +56,7 @@ merge.verbosity::
message if conflicts were detected. Level 1 outputs only
conflicts, 2 outputs conflicts and file changes. Level 5 and
above outputs debugging information. The default is level 2.
- Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+ Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
HOW MERGE WORKS