git grep: Add "-z/--null" option as in GNU's grep.

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 5ebed57be3ee030f27310562e004a26c730420e8..ff088c5c294527dd97c542012483aafe3ca64314 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -47,9 +47,9 @@ A sample script called 'git-merge-one-file' is included in the
 distribution.
 
 ALERT ALERT ALERT! The git "merge object order" is different from the
-RCS `merge` program merge object order. In the above ordering, the
+RCS 'merge' program merge object order. In the above ordering, the
 original is first. But the argument order to the 3-way merge program
-`merge` is to have the original in the middle. Don't ask me why.
+'merge' is to have the original in the middle. Don't ask me why.
 
 Examples: