index 17e9f10c659844e55e56b0d3a005e5f250f43c20..b726ddfe125f54986dad4c0f19c53d657de082b5 100644 (file)
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