Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_vim / refs/heads/android-16 / . / runtime / doc / vimdiff-ru.1
blob: e5121a4515138be022306828050c3559de010bdd [file] [log] [blame]
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]1.TH VIMDIFF 1 "13 ÉÀÎÑ 2021"
2.SH îáúîáþåîéå
3ðÒÏÇÒÁÍÍÁ vimdiff \[em] ÚÁÐÕÓËÁÅÔ ÒÅÄÁËÔÏÒ Vim ÄÌÑ ÓÒÁ×ÎÅÎÉÑ É ÐÒÁ×ËÉ ÏÔ Ä×ÕÈ ÄÏ
4×ÏÓØÍÉ ×ÅÒÓÉÊ ÔÅËÓÔÏ×ÏÇÏ ÆÁÊÌÁ.
5.SH ëáôëéê ïâúïò
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]6.br
7.B vimdiff
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]8[ÁÒÇÕÍÅÎÔÙ] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]]
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]9.PP
10.B gvimdiff
11.SH ïðéóáîéå
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]12ðÏ ËÏÍÁÎÄÅ
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]13.B vimdiff
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]14×ÙÐÏÌÎÑÅÔÓÑ ÚÁÇÒÕÚËÁ × ÒÅÄÁËÔÏÒ
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]15.B Vim
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]16ÏÔ Ä×ÕÈ ÄÏ ×ÏÓØÍÉ ÆÁÊÌÏ×, É ÄÌÑ ËÁÖÄÏÇÏ ÆÁÊÌÁ ÓÏÚÄÁ£ÔÓÑ ÏÔÄÅÌØÎÏÅ ÏËÎÏ.
17òÁÚÌÉÞÉÑ ÍÅÖÄÕ ÆÁÊÌÁÍÉ ×ÙÄÅÌÑÀÔÓÑ Ó ÐÏÍÏÝØÀ ÐÏÄÓ×ÅÔËÉ.
18üÔÏÔ ÓÐÏÓÏ ÏÞÅÎØ ÕÄÏÂÅÎ ÄÌÑ ÎÁÇÌÑÄÎÏÇÏ ÏÔÏÂÒÁÖÅÎÉÑ ×ÎÅÓ£ÎÎÙÈ ÉÚÍÅÎÅÎÉÊ
19É ÐÅÒÅÎÏÓÁ ÒÁÚÌÉÞÁÀÝÉÈÓÑ ÆÒÁÇÍÅÎÔÏ× ÔÅËÓÔÁ ÉÚ ÏÄÎÏÊ ×ÅÒÓÉÉ ÆÁÊÌÁ × ÄÒÕÇÕÀ.
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]20.PP
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]21ðÏÄÒÏÂÎÅÅ Ï ÒÅÄÁËÔÏÒÅ Vim ÓÍ. × ÓÐÒÁ×ÏÞÎÉËÅ vim(1).
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]22.PP
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]23ðÒÉ ÚÁÐÕÓËÅ ÒÅÄÁËÔÏÒÁ Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]24.B gvimdiff
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]25ÂÕÄÔÅ ×ÙÐÏÌÎÅÎÏ ÐÅÒÅËÌÀÞÅÎÉÅ ÎÁ ÇÒÁÆÉÞÅÓËÉÊ ÉÎÔÅÒÆÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÅÓÌÉ ÜÔÏ
26×ÏÚÍÏÖÎÏ.
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]27.PP
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]28äÌÑ ËÁÖÄÏÇÏ ÓÏÚÄÁÎÎÏÇÏ ÏËÎÁ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ ÐÁÒÁÍÅÔÒ 'diff', ÞÔÏ ÐÏÚ×ÏÌÑÅÔ
29ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÄÓ×ÅÔËÕ ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÒÁÚÌÉÞÉÊ ÍÅÖÄÕ ÆÁÊÌÁÍÉ.
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]30.br
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]31äÌÑ ÕÌÕÞÛÅÎÉÑ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ × ÒÅÖÉÍÅ ÓÒÁ×ÎÅÎÉÑ ÒÁÚÌÉÞÉÊ ÔÁËÖÅ ÂÕÄÕÔ
32ÕÓÔÁÎÏ×ÌÅÎÙ ÐÁÒÁÍÅÔÒÙ 'wrap' É 'scrollbind'.
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]33.br
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]34äÌÑ ÐÁÒÁÍÅÔÒÁ 'foldmethod' ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÚÎÁÞÅÎÉÅ "diff", ÞÔÏ ÐÏÚ×ÏÌÑÅÔ
35Ó×ÏÒÁÞÉ×ÁÔØ ÏÂÌÁÓÔÉ ÔÅËÓÔÁ, ËÏÔÏÒÙÅ ÉÄÅÎÔÉÞÎÙ × ÒÁÚÌÉÞÎÙÈ ×ÅÒÓÉÑÈ ÆÁÊÌÁ.
36úÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ 'foldcolumn' ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÒÁ×ÎÙÍ 2, ÞÔÏÂÙ ÂÙÌÏ ÐÒÏÝÅ
37ÎÁÈÏÄÉÔØ, ÏÔËÒÙ×ÁÔØ É ÚÁËÒÙ×ÁÔØ ÔÁËÉÅ ÏÂÌÁÓÔÉ Ó×£ÒÎÕÔÏÇÏ ÔÅËÓÔÁ.
38.SH áòçõíåîôù ëïíáîäîïê óôòïëé
39ðÒÉ ÓÏÐÏÓÔÁ×ÌÅÎÉÉ ÆÁÊÌÏ×, ÉÓÐÏÌØÚÕÅÔÓÑ ×ÅÒÔÉËÁÌØÎÏÅ ÒÁÓÐÏÌÏÖÅÎÉÅ ÏËÏÎ, ËÁË ÅÓÌÉ
40ÂÙ ÂÙÌ ÕËÁÚÁÎ ÁÒÇÕÍÅÎÔ "\-O". äÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÏËÎÁ ÒÁÓÐÏÌÁÇÁÌÉÓØ ÐÏ ÇÏÒÉÚÏÎÔÁÌÉ,
41ÓÌÅÄÕÅÔ ÕËÁÚÁÔØ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ÁÒÇÕÍÅÎÔ "\-o".
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]42.PP
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]43ïÓÔÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÏÐÉÓÁÎÙ × ÓÐÒÁ×ÏÞÎÉËÅ vim(1).
44.SH óíïôòéôå ôáëöå
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]45vim(1)
46.SH á÷ôïòù
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]47âÏÌØÛÁÑ ÞÁÓÔØ ÒÅÄÁËÔÏÒÁ
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]48.B Vim
RestorerZ12333ba2024-08-20 19:57:00 +0200[diff] [blame]49ÂÙÌÁ ÓÏÚÄÁÎÁ âÒÁÍÏÍ íÏÌÅÎÁÒÏÍ (Bram Moolenaar), ËÏÔÏÒÏÍÕ ÐÏÍÏÇÁÌÏ ÏÇÒÏÍÎÏÅ
50ËÏÌÉÞÅÓÔ×Ï ÌÀÄÅÊ. óÍ. ":help credits" × ÒÅÄÁËÔÏÒÅ
Bram Moolenaar217ad922005-03-20 22:37:15 +0000[diff] [blame]51.B Vim.