{"revision": {"id": "f33e4332-2f95-11f1-a9ac-e86a64d24d78", "node_id": "f33d4f88-2f95-11f1-821d-e86a64d24d78", "user_id": "edc3f576-2f95-11f1-900f-e86a64d24d78", "author": "foxhop", "data": "Vim Tips and Tricks\r\n========================\r\n\r\n.. contents::\r\n\r\nAs I learn more about vim, I plan to document the tips and tricks I learn here.\r\n\r\n\r\nvimdiff or hg merge\r\n-----------------------\r\n\r\nSome common commands:\r\n\r\n.. code-block:: none\r\n  \r\n ctrl w (twice)\r\n \r\n    switch windows\r\n\r\n do\r\n\r\n    diff obtain, take the other window's differences. Pull the change.\r\n\r\n dp\r\n\r\n    diff put, give the other window our differences. Push the change.\r\n\r\n [c\r\n \r\n    move focus to previous difference.\r\n\r\n ]c\r\n \r\n    move focus to next difference.\r\n\r\n :diffupdate\r\n \r\n    diff update \r\n\r\n\r\n :diffget <window number>\r\n\r\n    get changes from specified window number and place them into current window.\r\n\r\n\r\n :diffput <window number>\r\n\r\n    put changes from current window into specified window number.\r\n\r\n\r\n zo\r\n\r\n    open folded text\r\n\r\n zc\r\n\r\n    close folded text", "source_format": "rst", "revision_number": 4, "created": 1301224658000}}