diff-index: enable recursive pathspec matching in unpack_trees

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index f1f4e7a07ddd9f09aaccec9f93d14e6cc3689a0a..2a49de7cfe5188b531bc02f1115e253bfa10e0e0 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -7,6 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
 
 SYNOPSIS
 --------
+[verse]
 'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
 
 DESCRIPTION