Mercurial > vim

annotate runtime/doc/vimdiff-pl.1 @ 24041:580ee78577e9 v8.2.2562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2562: GUI: star register changed when 'clipboard is "unnamedplus" Commit: https://github.com/vim/vim/commit/37096afd3f3133a831ab49a9677f090c3c935c9d Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 2 19:04:11 2021 +0100 patch 8.2.2562: GUI: star register changed when 'clipboard is "unnamedplus" Problem: GUI: star register changed when 'clipboard is "unnamedplus". (Ingo Karkat) Solution: Do not change the star register when 'clipboard' contains "unnamedplus" and not "unnamed". (closes #1516)
author Bram Moolenaar <Bram@vim.org>
date Tue, 02 Mar 2021 19:15:03 +0100
parents de5a43c5eedc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
1 .TH VIMDIFF 1 "2001 Mar 30"
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
2 .SH NAZWA
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
3 vimdiff \- edytuj dwie, trzy lub cztery wersje pliku w Vimie i zobacz różnice
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
4 .SH SYNOPSIS
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
5 .br
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
6 .B vimdiff
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
7 [opcje] plik1 plik2 [plik3 [plik4]]
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
8 .PP
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
9 .B gvimdiff
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
10 .SH OPIS
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
11 .B Vimdiff
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
12 uruchomi
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
13 .B Vima
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
14 z dwoma (trzema lub czterema plikami), każdy z nich we własnym oknie.
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
15 Różnice między plikami zostaną podświetlone.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
16 Jest to dobry sposób by przeanalizować różnice i przenieść zmiany z jednej
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
17 wersji pliku do innej.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
18 .PP
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
19 Zobacz vim(1) by poznać więcej szczegółów o samym Vimie.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
20 .PP
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
21 Kiedy uruchomiony jako
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
22 .B gvimdiff
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
23 zostanie uruchomione GUI (jeśli dostępne).
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
24 .PP
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
25 W każdym oknie zostanie ustawiona opcja 'diff', która spowoduje
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
26 podświetlenie różnic.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
27 .br
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
28 Opcje 'wrap' i 'scrollbind' zostaną ustawione by tekst się
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
29 wygodnie przeglądało.
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
30 .br
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
31 Opcja 'foldmethod' zostanie ustawiona na "diff", dzięki czemu
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
32 niezmienione linie zostaną zwinięte. 'foldcolumn' będzie równe 2 aby
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
33 łatwo wyszukiwać, otwierać i zamykać zwinięcia.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
34 .SH OPCJE
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 809
diff changeset
35 Pionowy podział zostanie użyty do wyrównania linii, tak jakby użyto
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
36 opcji "\-O". Aby uzyskać poziomy podział użyj opcji "\-o".
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
37 .PP
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
38 Aby poznać inne opcje zobacz vim(1).
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
39 .SH ZOBACZ TAKŻE
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
40 vim(1)
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
41 .SH AUTOR
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
42 Większość
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
43 .B Vima
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
44 została napisana przez Brama Moolenaara przy pomocy wielu innych osób.
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
45 Zobacz ":help credits w
4f1b94b51e99 updated for version 7.0b02
vimboss
parents:
diff changeset
46 .B Vimie.