merge overwrites unstaged changes in renamed file

[git.git] / Documentation / gitdiffcore.txt

diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 6af29a4603de57e0040c4bcd819b831dd6649f92..370624c17174ddc67d4d29fd54127096f4f5b070 100644 (file)
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -7,6 +7,7 @@ gitdiffcore - Tweaking diff output
 
 SYNOPSIS
 --------
+[verse]
 'git diff' *
 
 DESCRIPTION