Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM

[git.git] / Documentation / git-fmt-merge-msg.txt

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index a586950b48bac6eda630383714c0ccd1b28820a8..a585dbe898171ddb8a205cc5a898d695540f80a6 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -16,7 +16,7 @@ DESCRIPTION
 -----------
 Takes the list of merged objects on stdin and produces a suitable
 commit message to be used for the merge commit, usually to be
 -----------
 Takes the list of merged objects on stdin and produces a suitable
 commit message to be used for the merge commit, usually to be

-passed as the '<merge-message>' argument of 'git-merge'.
+passed as the '<merge-message>' argument of 'git merge'.

 
 This command is intended mostly for internal use by scripts
 automatically invoking 'git merge'.
 
 This command is intended mostly for internal use by scripts
 automatically invoking 'git merge'.