Merge branch 'js/maint-add-path-stat-pwd' into maint

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 52db1d80cfe068f39ae5996a88e95bbfcf095a36..a6253ba617f5ebcd82e4cfb1702999c145fa346c 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,6 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
 
 SYNOPSIS
 --------
+[verse]
 'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
 
 DESCRIPTION