diff options
| author |  Edward Betts <edward@4angle.com> | 2017-02-11 09:38:49 +0000 |
|---|---|---|
| committer |  Joey Hess <joeyh@joeyh.name> | 2017-02-12 17:30:23 -0400 |
| commit | c6e4dcca673841f29449c8c2bf85fa41b31da12f (patch) | |
| tree | a0e16f9c52f6690be527044031607d97fae7d706 /doc/bugs/direct_mode_merge_interrupt.mdwn | |
| parent | f765752568381ca2f003c08e9601fb2b5c397b5b (diff) | |
correct spelling mistakes
Diffstat (limited to 'doc/bugs/direct_mode_merge_interrupt.mdwn')
| -rw-r--r-- | doc/bugs/direct_mode_merge_interrupt.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/bugs/direct_mode_merge_interrupt.mdwn b/doc/bugs/direct_mode_merge_interrupt.mdwn index 5c26e1773..f6bb795b6 100644 --- a/doc/bugs/direct_mode_merge_interrupt.mdwn +++ b/doc/bugs/direct_mode_merge_interrupt.mdwn @@ -20,7 +20,7 @@ update the whole work tree, and only after it's updated should it update the index and the current branch to reflect the merge. This way, if the merge is interrupted, the work tree may have uncommitted -changed -- but it's fine if they get accidentially committed, since when +changed -- but it's fine if they get accidentally committed, since when the merge is re-done, those changes will by the same ones made by the merge. (I assume this is how `git merge` normally works.) --[[Joey]] |