Fix typo in helpfile

This commit is contained in:
Andreas Hunkeler
2020-12-17 10:13:22 +01:00
committed by GitHub
parent 7afa1cfaa6
commit bebe504e38

View File

@@ -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.