X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=17a15acb07df2d8beed4a41cdcf820010f95b35b;hb=73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff;hp=a7487d3dfdb20dc56909a7ebccaac6e3b7b36e48;hpb=93310a40eb022a0e36e7c618921931d8ffc31fd1;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a7487d3df..17a15acb0 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -32,8 +32,8 @@ include::merge-options.txt[] it is created). The 'git-fmt-merge-msg' script can be used to give a good default for automated 'git-merge' invocations. -:: - Other branch head merged into our branch. You need at +...:: + Other branch heads to merge into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus. @@ -145,7 +145,7 @@ linkgit:git-mergetool[1] Author ------ -Written by Junio C Hamano +Written by Junio C Hamano Documentation