index 332e023d0f14be813ead6cb6915938910ea3a719..0cf505ea84d231e4e4997676d4169c5c5c7dd9f9 100644 (file)
processes them in turn only stopping if merge returns a non-zero exit
code.
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.
A sample script called "git-merge-one-file" is included in the
distribution.
fatal: merge program failed
where the latter example shows how "git-merge-index" will stop trying to
fatal: merge program failed
where the latter example shows how "git-merge-index" will stop trying to
-merge once anything has returned an error (ie "cat" returned an error
+merge once anything has returned an error (i.e., "cat" returned an error
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).