[arch-general] merging files from pacnew

[Karol Blazewicz]

On Mon, Jun 25, 2012 at 2:53 PM, Arno Gaboury <arnaud.gaboury at gmail.com> wrote:
> Please have a look at the WIKI. I added this morning the list of shortcuts
> you are talking about under section " A quick roundup of vimdiff "

You seem to use 'insert mode' and 'edit mode' as the name for the same
mode which may create confusion.

If you want, you can add a hint about

" Smart way to move between windows
map <C-j> <C-W>j
map <C-k> <C-W>k
map <C-h> <C-W>h
map <C-l> <C-W>l

that you need to put in your .vimrc.