X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=5caee90adc43d2f59893f3e59fda23b5a05462a9;hb=b67b9b2034fc8983e796437034ab71cfce162d0b;hp=1b99f2b3cdd939964c275a202ffa71dc5d1b8f44;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 1b99f2b3c..5caee90ad 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -85,5 +85,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list