merge-recursive: mark rename/delete conflict as unmerged

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index cc95b69f27c3d4b5437fa15e3d1e825a7ae8576e..d1a17e2625890245341a2099cc2b058e63564da2 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -7,7 +7,7 @@ gitmodules - defining submodule properties
 
 SYNOPSIS
 --------
-gitmodules
+$GIT_WORK_DIR/.gitmodules
 
 
 DESCRIPTION
@@ -59,4 +59,4 @@ Documentation by Lars Hjemli <hjemli@gmail.com>
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite