GIT 1.0.0a

[git.git] / Documentation / git-diff-files.txt

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index b45d1e6..67f5126 100644 (file)
--- 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