t6022: Add tests for reversing order of merges when D/F conflicts present

diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 65a0da508a6be033e46850dc46b4fb700c93ad50..fde209258234edd221dea2f5b096c78f1978eeb4 100644 (file)
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt
@@ -65,7 +65,7 @@ OPTIONS
 BUGS
 ----
 Comparing blobs or trees that have been replaced with those that
-replace them will not work properly. And using 'git reset --hard' to
+replace them will not work properly. And using `git reset --hard` to
 go back to a replaced commit will move the branch to the replacement
 commit instead of the replaced commit.