checkout -m: recreate merge when checking out of unmerged index

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 859d67990a62049c2f328dfd676cf21da8ff9a27..cba90fd27c6a1baaca884328e96adc8a6da8fc36 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -241,4 +241,4 @@ endif::git-format-patch[]
        Do not show any source or destination prefix.
 
 For more detailed explanation on these common options, see also
-link:diffcore.html[diffcore documentation].
+linkgit:gitdiffcore[7].