Mercurial > vim

comparison runtime/doc/diff.txt @ 819:23f82b5d2814 v7.0c10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0c10
author vimboss
date Wed, 05 Apr 2006 20:41:53 +0000
parents 9f345c48220b
children 6675076019ae
comparison
equal deleted inserted replaced
818:1f929f3ca806 819:23f82b5d2814
1 *diff.txt* For Vim version 7.0c. Last change: 2006 Mar 15 1 *diff.txt* For Vim version 7.0c. Last change: 2006 Apr 04
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
270 :1,$+1diffget 270 :1,$+1diffget
271 271
272 Note that deleted lines are displayed, but not counted as text lines. You 272 Note that deleted lines are displayed, but not counted as text lines. You
273 can't move the cursor into them. To fill the deleted lines with the lines 273 can't move the cursor into them. To fill the deleted lines with the lines
274 from another buffer use ":diffget" on the line below them. 274 from another buffer use ":diffget" on the line below them.
275 *E787*
276 When the buffer that is about to be modified is read-only and the autocommand
277 that is triggered by |FileChangedRO| changes buffers the command will fail.
278 The autocommand must not change buffers.
275 279
276 The [bufspec] argument above can be a buffer number, a pattern for a buffer 280 The [bufspec] argument above can be a buffer number, a pattern for a buffer
277 name or a part of a buffer name. Examples: 281 name or a part of a buffer name. Examples:
278 282
279 :diffget Use the other buffer which is in diff mode 283 :diffget Use the other buffer which is in diff mode