X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-resolve.txt;h=7d3eb79033ae857fdaa164d18ef5607fb91f38d0;hb=ab1630a3ed31d6ec5ae83769c78ed542fe3c4a28;hp=d0583181941bc88678f803953bbffe96836e992b;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index d0583181..7d3eb790 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -33,5 +33,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list