index db38e2407ab3e8344db05c3048db9e46db023376..4e57c2b2877b1594b3a467c0930348221e98c672 100644 (file)
SYNOPSIS
--------
-'git resolve' <current> <merged> <message>
+'git-resolve' <current> <merged> <message>
DESCRIPTION
-----------