Merge branch 'master' into next

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 712739777b6c98449d2efdd5b6ce31724f3f5db6..86aad37c6acaf0c37995221456bffc61ed3bc883 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -1,6 +1,5 @@
 git-merge-one-file(1)
 =====================
-v0.99.4, Aug 2005
 
 NAME
 ----