merge-recursive: separate out xdl_merge() interface.

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 6099be2add74c2eb82ea5b1af844174a4dd896b5..3190aed10885b5f3471dfc30922c141835d6c4f1 100644 (file)
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -3,7 +3,7 @@ git-merge-base(1)
 
 NAME
 ----
-git-merge-base - Finds as good a common ancestor as possible for a merge
+git-merge-base - Find as good common ancestors as possible for a merge
 
 
 SYNOPSIS