X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=d285cba033325f8652996ea71a06d53c22424dae;hb=c43f64a0afd7b4bd87ec83449995fad21b741af6;hp=912ef29efce71d944af59588c6493591efc96bfc;hpb=8009533070638490603eee06e1622f3e5aa3bfb2;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 912ef29ef..d285cba03 100644
--- 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