X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=af68d694a0ad8066b05fcc02bae8e57a7c137034;hb=9e4a90ba19033d25dca1eea495b0a8c5f06efbc6;hp=c04ae739edd409307d286fe31e6f87e41f977eac;hpb=7d5a1806e8c2d9980938a05a56939272ad2ec338;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c04ae739e..af68d694a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ]... - [-m ] ... + [-m ] ... 'git merge' HEAD ... DESCRIPTION