difftool: handle unmerged files in dir-diff mode

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6cca8bb51dcabd47474ad63d908d7ec5d06d8703..6ed610a031eeec7320adbbb4a627dc4997499e56 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -3,7 +3,7 @@ git-rebase(1)
 
 NAME
 ----
-git-rebase - Forward-port local commits to the updated upstream head
+git-rebase - Reapply commits on top of another base tip
 
 SYNOPSIS
 --------