X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=b726ddfe125f54986dad4c0f19c53d657de082b5;hb=37ec2b4c26901d5f1ca19948189dc2b6f21523d5;hp=17e9f10c659844e55e56b0d3a005e5f250f43c20;hpb=5bd148bfe8a4f2df8487e029cd4ee6809bc4c963;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 17e9f10c6..b726ddfe1 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with the a script calling git's imitation of +Typically this is run with a script calling git's imitation of the merge command from the RCS package. A sample script called "git-merge-one-file" is included in the