aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-09 13:25:22 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-09 13:25:22 +1200
commit7381d4492505aea7cb0f7ac8e7e4775113605dbd (patch)
tree3dd11a913e07ea640186a79be274269c14b883aa
parentMerge branch 'release/v1.2.0' into develop (diff)
downloadvim-diff-prune-7381d4492505aea7cb0f7ac8e7e4775113605dbd.tar.gz
vim-diff-prune-7381d4492505aea7cb0f7ac8e7e4775113605dbd.zip
Switch to two-spacing
-rw-r--r--README.md6
-rw-r--r--doc/diff_prune.txt8
2 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index 4f8511b..3617233 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ If the changes result in a diff block or file block having no changes left, it
is also removed.
This can be handy for using with the `-e` or `--edit` option to `git-add`,
-which allows you to edit a diff before applying changes to the staging area. It
-also seems to work for the `-p` or `--patch` option.
+which allows you to edit a diff before applying changes to the staging area.
+It also seems to work for the `-p` or `--patch` option.
License
-------
-Copyright (c) [Tom Ryder][1]. Distributed under the same terms as Vim itself.
+Copyright (c) [Tom Ryder][1]. Distributed under the same terms as Vim itself.
See `:help license`.
[1]: https://sanctum.geek.nz/
diff --git a/doc/diff_prune.txt b/doc/diff_prune.txt
index d1be82b..aa83c5e 100644
--- a/doc/diff_prune.txt
+++ b/doc/diff_prune.txt
@@ -11,19 +11,19 @@ If the changes result in a diff block or file block having no changes left, it
is also removed.
This can be handy for using with the `-e` or `--edit` option to `git-add`,
-which allows you to edit a diff before applying changes to the staging area. It
-also seems to work for the `-p` or `--patch` option.
+which allows you to edit a diff before applying changes to the staging area.
+It also seems to work for the `-p` or `--patch` option.
REQUIREMENTS *diff_prune-requirements*
-This plugin is only available if 'compatible' is not set. It requires Vim 7.0
+This plugin is only available if 'compatible' is not set. It requires Vim 7.0
or newer.
MAPPINGS *diff_prune-mappings*
*<Plug>(DiffPrune)*
A single mapping target name `<Plug>(DiffPrune)` for normal and visual modes
-provided. There is no default key mapping. You could put this in
+provided. There is no default key mapping. You could put this in
`after/ftplugin/diff.vim` to use `<LocalLeader>p`, with `<LocalLeader>pp` to
prune the current line:
>