diff options
Diffstat (limited to 'Documentation/git-rerere.adoc')
| -rw-r--r-- | Documentation/git-rerere.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.adoc b/Documentation/git-rerere.adoc index 99f967b7a4..4e6ab9a27c 100644 --- a/Documentation/git-rerere.adoc +++ b/Documentation/git-rerere.adoc @@ -44,7 +44,7 @@ will automatically invoke this command. 'forget' <pathspec>:: Reset the conflict resolutions which rerere has recorded for the current -conflict in paths that match <pathspec>. +conflicts in paths that match <pathspec>. 'diff':: |