Translated by Lilian

This commit is contained in:
Lilian 2022-05-02 11:46:49 +02:00
parent 2bfeea0c99
commit f60b98b899

View File

@ -73326,6 +73326,14 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
<seg>Tapez @kbd{c} pour commenter un fichier à partir du tampon de miniature.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>You control the merging by typing special @dfn{merge commands} in the merge buffer (@pxref{Merge Commands}).</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T094648Z" creationid="Lilian" creationdate="20220502T094348Z">
<seg>Vous contrôlez la fusion en tapant des @dfn{commandes de fusion} spéciales dans le tampon de fusion (@pxref{Commandes de fusion}).</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>You could also compare files using @code{ediff-files}, see @ref{Major Entry Points,,, ediff, Ediff User's Manual}.</seg>