Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 912ef29efce71d944af59588c6493591efc96bfc..d285cba033325f8652996ea71a06d53c22424dae 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -95,7 +95,7 @@ When things cleanly merge, these things happen:
 1. the results are updated both in the index file and in your
    working tree,
 2. index file is written out as a tree,
-3. the tree gets committed, and 
+3. the tree gets committed, and
 4. the `HEAD` pointer gets advanced.
 
 Because of 2., we require that the original state of the index