Todos conocen el comando diff para encontrar diferencias entre dos archivos.
Everyone knows the diff command to find the differences between two files.
El comando diff compara dos archivos, informando las deferencias que hay entre ellos.
The diff command compares two files, reporting on differences between them.
Revisa los archivos etiquetados por el comando diff durante la verificación de integridad de los archivos núcleo.
Review files flagged by the diff command during the core file integrity check.
Para comparar únicamente archivos o directorios locales, suminístrelos como argumentos al comando diff.
To compare only local files or directories, supply them as arguments to the diff command.
En su forma más simple, se pasa a la función que desea diferenciar al comando diff como argumento.
In its simplest form, you pass the function you want to differentiate to diff command as an argument.
Esta no es una lista exhaustiva; para ver todas las opciones de comparación, consulte la referencia del comando diff.
This is not an exhaustive list; for reference to all available comparison options, see the diff command reference.
Para ello, el comando diff ofrece las siguientes opciones
The diff command provides the following options for that purpose
Si ejecuta el comando diff sin definir la opción - dir-compare-contents el ejecutable la buscará en este archivo de configuración.
When you run the diff command without setting the - dir-compare-sizes option, the executable will look for it in this configuration file.
El comando diff ofrece un gran número de opciones adicionales para comparaciones avanzadas, como por ejemplo
The diff command provides a large number of additional options for advanced comparison needs, for example
En el contexto del comando diff, puedes poner tres puntos tras el nombre de una rama para hacer un diff entre el último commit de la rama en la que estás y su ancestro común con otra rama
In the context of the diff command, you can put three periods after another branch to do a diff between the last commit of the branch you're on and its common ancestor with another branch
En este caso, si suministra dos argumentos (por ejemplo, dos rutas de acceso a archivos) al comando diff, los argumentos se interpretarán primero en el lado izquierdo de la comparación y después en el derecho.
In this case, if you supply two arguments (for example, two file paths) to the diff command, the arguments will be interpreted in the following order: left side of the comparison, right side of the comparison.
Al ejecutar este comando el resultado de la comparación se indica devolviendo un código de error (0 = no hay diferencias, 1 = diferencias, 2 = error), de forma parecida a como funciona el comando diff.
When you run this command, the outcome of the comparison is reported by the return error code (0 = no differences, 1 = differences, 2 = error), similar to how it works with the diff command.
Por ejemplo, si usase svn diff para comparar las revisiones 99 y 102 de foo.c, vería ficheros diferenciales basados en líneas; el comando diff esta comparando a ciegas ambas rutas.
For example, if you asked svn diff to compare revisions 99 and 102 of foo.c, you would see line-based diffs; the diff command is blindly comparing two paths.
