Mercurial > vim

annotate runtime/doc/vimdiff-fr.UTF-8.1 @ 13605:10967d36a530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag v8.0.1674 for changeset caa9825b04cd6a0b68dbe89670f7a4728561d821
author Christian Brabandt <cb@256bit.org>
date Sat, 07 Apr 2018 21:45:07 +0200
parents 1b584a6f446c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
236
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
1 .TH VIMDIFF 1 "30 mars 2001"
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
2 .SH NOM
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 236
diff changeset
3 vimdiff \- ouvre deux, trois ou quatre versions d'un fichier dans Vim et
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 236
diff changeset
4 affiche leurs différences
236
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
5 .SH SYNOPSIS
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
6 .br
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
7 .B vimdiff
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 236
diff changeset
8 [options] fichier1 fichier2 [fichier3 [fichier4]]
236
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
9 .PP
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
10 .B gvimdiff
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
11 .SH DESCRIPTION
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
12 .B Vimdiff
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
13 démarre
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
14 .B Vim
2033
de5a43c5eedc Update documentation files.
Bram Moolenaar <bram@zimbu.org>
parents: 236
diff changeset
15 avec deux (ou trois ou quatre) fichiers.
236
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
16 Chaque fichier est ouvert dans sa propre fenêtre.
3513
1b584a6f446c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2033
diff changeset
17 Les différences entre ces fichiers sont mises en surbrillance.
236
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
18 C'est un outil très pratique pour visualiser et reporter les
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
19 changements entre deux versions d'un même fichier.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
20 .PP
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
21 Consulter vim(1) pour des informations sur l'éditeur Vim lui-même.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
22 .PP
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
23 Si
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
24 .B gvimdiff
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
25 est invoqué, l'IHM graphique est démarrée quand elle est disponible.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
26 .PP
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
27 L'option 'diff' est activée dans chacune des fenêtres, ce qui provoque la mise
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
28 en surbrillance des différences.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
29 .br
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
30 Les options 'wrap' et 'scrollbind' sont activées pour donner un aspect
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
31 agréable au texte.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
32 .br
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
33 L'option 'foldmethod' est fixée à "diff", ce qui replie les lignes consécutives
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
34 identiques. 'foldcolumn' est fixé à 2 pour trouver les replis rapidement et
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
35 les ouvrir ou les fermer facilement.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
36 .SH ARGUMENTS
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
37 La fenêtre de Vim est partagée verticalement afin d'afficher les lignes
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
38 correspondantes les unes en face des autres, comme si l'argument "\-O" était
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
39 spécifié. Utilisez l'argument "\-o" pour obtenir un partage horizontal à la
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
40 place.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
41 .PP
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
42 Pour connaître les autres arguments disponibles, consultez vim(1).
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
43 .SH VOIR AUSSI
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
44 vim(1)
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
45 .SH AUTEUR
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
46 La majeure partie de
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
47 .B Vim
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
48 a été écrite par Bram Moolenaar, avec l'aide de nombreux autres contributeurs.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
49 Voir ":help credits" dans
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
50 .B Vim.
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
51 .SH TRADUCTION
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
52 Cette page de manuel a été traduite par David Blanchet
4707450c2b33 updated for version 7.0066
vimboss
parents:
diff changeset
53 <david.blanchet@free.fr> 2005-03-12.
3513
1b584a6f446c Updated runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2033
diff changeset
54 Mise à jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>