X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=0cf505ea84d231e4e4997676d4169c5c5c7dd9f9;hb=f5c589f1dfff428a05b8783688513fe9f98309a2;hp=6cd060108292733725aca28cc8f0b83aa7d0f56e;hpb=b642d9ef643371990c0a921836f2a074d48ce1b3;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 6cd060108..0cf505ea8 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -40,8 +40,8 @@ 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 the merge command from -the RCS package. +Typically this is run with the 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 distribution.