Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt
index 34cd306bb1ee6ac73986cf3371114381b4165a0d..c6a983a5d54abe2b18d155b6cba520c257da6f59 100644 (file)
--- a/Documentation/diffcore.txt
+++ b/Documentation/diffcore.txt
@@ -71,7 +71,7 @@ The first transformation in the chain is diffcore-pathspec, and
 is controlled by giving the pathname parameters to the
 git-diff-* commands on the command line.  The pathspec is used
 to limit the world diff operates in.  It removes the filepairs
-outside the specified set of pathnames.  E.g. If the input set 
+outside the specified set of pathnames.  E.g. If the input set
 of filepairs included:
 
 ------------------------------------------------
@@ -269,4 +269,3 @@ Documentation
 *.c
 t
 ------------------------------------------------
-