Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 5bdaa601f07929d515d751ed441fa95c925ae384..e9f82b97b91b92785b76a224e176b695593cdbe7 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -54,7 +54,7 @@ frequently used options.
 
        Limit commits to the ones touching files in the given paths. Note, to
        avoid ambiguity wrt. revision names use "--" to separate the paths
-       from any preceeding options.
+       from any preceding options.
 
 Examples
 --------
@@ -99,4 +99,3 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list
 GIT
 ---
 Part of the gitlink:git[7] suite
-