index 43680840e15d677ad54ad5de8561dfff4e63662d..4f04bbb1aa573e7092c48add8571fb8203537412 100644 (file)
code.
Typically this is run with a script calling git's imitation of
-the merge command from the RCS package.
+the 'merge' command from the RCS package.
A sample script called `git-merge-one-file` is included in the
distribution.