Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'np/pack'
[gitweb.git]
/
Documentation
/
git-resolve.txt
diff --git
a/Documentation/git-resolve.txt
b/Documentation/git-resolve.txt
index db38e2407ab3e8344db05c3048db9e46db023376..4e57c2b2877b1594b3a467c0930348221e98c672 100644
(file)
--- a/
Documentation/git-resolve.txt
+++ b/
Documentation/git-resolve.txt
@@
-8,7
+8,7
@@
git-resolve - Merge two commits
SYNOPSIS
--------
-'git
resolve' <current> <merged> <message>
+'git
-
resolve' <current> <merged> <message>
DESCRIPTION
-----------