Mercurial > vim

comparison runtime/doc/diff.txt @ 195:49748afd794b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0058
author vimboss
date Tue, 08 Mar 2005 22:40:03 +0000
parents 4ac1dce8dd5e
children a20218704019
comparison
equal deleted inserted replaced
194:5f7701639303 195:49748afd794b
1 *diff.txt* For Vim version 7.0aa. Last change: 2004 Jul 20 1 *diff.txt* For Vim version 7.0aa. Last change: 2005 Mar 08
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
155 :!cp % tempfile 155 :!cp % tempfile
156 :diffsplit tempfile 156 :diffsplit tempfile
157 157
158 A buffer that is unloaded cannot be used for the diff. But it does work for 158 A buffer that is unloaded cannot be used for the diff. But it does work for
159 hidden buffers. You can use ":hide" to close a window without unloading the 159 hidden buffers. You can use ":hide" to close a window without unloading the
160 buffer. 160 buffer. If you don't want a buffer to remain used for the diff do ":set
161 161 nodiff" before hiding it.
162 162
163 *:diffu* *:diffupdate* 163 *:diffu* *:diffupdate*
164 Vim attempts to keep the differences updated when you make changes to the 164 Vim attempts to keep the differences updated when you make changes to the
165 text. This mostly takes care of inserted and deleted lines. Changes within a 165 text. This mostly takes care of inserted and deleted lines. Changes within a
166 line and more complicated changes do not cause the differences to be updated. 166 line and more complicated changes do not cause the differences to be updated.