X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=712739777b6c98449d2efdd5b6ce31724f3f5db6;hb=ab1630a3ed31d6ec5ae83769c78ed542fe3c4a28;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..71273977 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -27,5 +27,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list