X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=67f51265e6aeadf85db582fe89c2c5752b36745a;hb=e4e79a217576d24ef4d73b620766f62b155bcd98;hp=b45d1e69da30cae6fad7eec3694c1768774519b8;hpb=10637b84d91cf8870d1db8609a10dc5e58722378;p=git.git

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index b45d1e69..67f51265 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -26,10 +26,9 @@ include::diff-options.txt[]
 	branch" respectively.  With these options, diffs for
 	merged entries are not shown.
 +
-The default is to diff against our branch (-2) if there
-is an unmerged path, and show diff for unmerged entries
-otherwise.  The option -0 can be given to force diff for
-unmerged entries even when the index is unmerged.
+The default is to diff against our branch (-2) and the 
+cleanly resolved paths.  The option -0 can be given to
+omit diff output for unmerged entries and just show "Unmerged".
 
 -q::
 	Remain silent even on nonexisting files