X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=86aad37c6acaf0c37995221456bffc61ed3bc883;hb=8c278abcbe35b23e9f93e99daf2144336fad1849;hp=b84d14d8b627db6f19720c764f79a5347da65ace;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index b84d14d8..86aad37c 100644 --- 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 ---- @@ -27,5 +26,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list