diff --git a/readme.md b/readme.md index baa254c..05c44c8 100644 --- a/readme.md +++ b/readme.md @@ -310,10 +310,14 @@ Vim's `:diffget` and `:diffput` commands are convenient and unambiguous as soon `vim-mergetool` comes with `DiffExchange` commands and mapping, that accepts direction of a diff movement: "left", "right", "up", "down". You can set up your own key mappings for diff mode only: ```vim -nmap &diff? '(MergetoolDiffExchangeLeft)' : '' -nmap &diff? '(MergetoolDiffExchangeRight)' : '' -nmap &diff? '(MergetoolDiffExchangeDown)' : '' -nmap &diff? '(MergetoolDiffExchangeUp)' : '' + nnoremap (cleft) + nnoremap (cright) + nnoremap (cdown) + nnoremap (cup) + nmap get(g:, 'mergetool_in_merge_mode', 0) ? '(MergetoolDiffExchangeLeft)' : '(cleft)' + nmap get(g:, 'mergetool_in_merge_mode', 0) ? '(MergetoolDiffExchangeRight)' : '(cright)' + nmap get(g:, 'mergetool_in_merge_mode', 0) ? '(MergetoolDiffExchangeDown)' : '(cdown)' + nmap get(g:, 'mergetool_in_merge_mode', 0) ? '(MergetoolDiffExchangeUp)' : '(cup)' ``` Commands are available as well: