difftool: handle unmerged files in dir-diff mode

diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index cbef61ba88788b6b3dc89e5031b3addfcf0a2e7b..fba0f1c1b27c629b31c86f78fbe22fdfd3ce360d 100644 (file)
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/git-upload-archive.txt
@@ -1,5 +1,5 @@
 git-upload-archive(1)
-====================
+=====================
 
 NAME
 ----