From bebe504e38d0a20c30d6dd666c4c793b3cc66104 Mon Sep 17 00:00:00 2001 From: Andreas Hunkeler Date: Thu, 17 Dec 2020 10:13:22 +0100 Subject: [PATCH] Fix typo in helpfile --- doc/fugitive.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/fugitive.txt b/doc/fugitive.txt index 3448c67..8979521 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -264,7 +264,7 @@ X Discard the change under the cursor. This uses `checkout` or `clean` under the hood. A command is echoed that shows how to undo the change. Consult `:messages` to see it again. You can use this during - a merge conflict do discard "our" changes (--theirs) + a merge conflict to discard "our" changes (--theirs) in the "Unstaged" section or discard "their" changes (--ours) in the "Staged" section.