Mercurial > vim

comparison runtime/doc/diff.txt @ 7228:873eae260c97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 10 21:15:48 2015 +0100 Updated runtime files.
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Nov 2015 21:30:05 +0100
parents 2def7b25de60
children f52b263fb3f0
comparison
equal deleted inserted replaced
7227:28f3b34d076f 7228:873eae260c97
1 *diff.txt* For Vim version 7.4. Last change: 2015 Jul 03 1 *diff.txt* For Vim version 7.4. Last change: 2015 Nov 01
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
180 A buffer that is unloaded cannot be used for the diff. But it does work for 180 A buffer that is unloaded cannot be used for the diff. But it does work for
181 hidden buffers. You can use ":hide" to close a window without unloading the 181 hidden buffers. You can use ":hide" to close a window without unloading the
182 buffer. If you don't want a buffer to remain used for the diff do ":set 182 buffer. If you don't want a buffer to remain used for the diff do ":set
183 nodiff" before hiding it. 183 nodiff" before hiding it.
184 184
185 *:diffu* *:diffupdate* 185 *:dif* *:diffupdate*
186 :diffu[pdate][!] Update the diff highlighting and folds. 186 :dif[fupdate][!] Update the diff highlighting and folds.
187 187
188 Vim attempts to keep the differences updated when you make changes to the 188 Vim attempts to keep the differences updated when you make changes to the
189 text. This mostly takes care of inserted and deleted lines. Changes within a 189 text. This mostly takes care of inserted and deleted lines. Changes within a
190 line and more complicated changes do not cause the differences to be updated. 190 line and more complicated changes do not cause the differences to be updated.
191 To force the differences to be updated use: > 191 To force the differences to be updated use: >