diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 1d97a17904f002d57cf90a90d4748664f7ad0db1..d5dfd8430f3370dc168e42e3991d1d4a9b854617 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -127,7 +127,7 @@ exception is when the changed index entries are in the state that
 would result from the merge already.)
 
 If all named commits are already ancestors of `HEAD`, 'git merge'
-will exit early with the message "Already up-to-date."
+will exit early with the message "Already up to date."
 
 FAST-FORWARD MERGE
 ------------------