diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-09-08 22:44:56 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-09-08 22:44:56 +0200 |
| commit | 22cf83b3c5920784188d7dcdfe1ff319cf4603f1 (patch) | |
| tree | 30c4fcd9ab3549c43904ed095e98f03bd4d91244 /Doc/Zsh/contrib.yo | |
| parent | 6c27cb3d5292f8ea6c93503afe54fcc1bce4c1cc (diff) | |
| parent | eaea1dc23c4a4e7b65046edd7f3d53a81e39e27b (diff) | |
| download | zsh-22cf83b3c5920784188d7dcdfe1ff319cf4603f1.tar.gz zsh-22cf83b3c5920784188d7dcdfe1ff319cf4603f1.zip | |
Merge tag 'zsh-5.1-test-1' into debian
Diffstat (limited to 'Doc/Zsh/contrib.yo')
| -rw-r--r-- | Doc/Zsh/contrib.yo | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index db0940d94..741d4ad07 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -1339,7 +1339,7 @@ tt(formats) and tt(actionformats) and will be available in the global tt(backend_misc) array as tt(${backend_misc[bookmarks]}). ) item(tt(gen-applied-string))( -Called in the tt(git) (with tt(stgit) or during rebase), and tt(hg) +Called in the tt(git) (with tt(stgit) or during rebase or merge), and tt(hg) (with tt(mq)) backends and in tt(quilt) support when the tt(applied-string) is generated; the tt(use-quilt) zstyle must be true for tt(quilt) (the tt(mq) and tt(stgit) backends are active by default). |