X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-resolve.txt;h=4e57c2b2877b1594b3a467c0930348221e98c672;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=7d3eb79033ae857fdaa164d18ef5607fb91f38d0;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt index 7d3eb790..4e57c2b2 100644 --- a/Documentation/git-resolve.txt +++ b/Documentation/git-resolve.txt @@ -1,6 +1,5 @@ git-resolve(1) ============== -v0.99.5, Aug 2005 NAME ---- @@ -9,7 +8,7 @@ git-resolve - Merge two commits SYNOPSIS -------- -'git resolve' +'git-resolve' DESCRIPTION -----------