O formato de saída padrão (antigo) exibirá a diferença entre os arquivos sem o texto ao redor com áreas onde os arquivos diferem.
Por exemplo: 1d0 <
(delete) significa que as maçãs precisam ser removidas da 1a linha de file1
e 2a2 >
(anexar) significa as maçãs precisa ser adicionado em file2
na segunda linha, para que ambos os arquivos possam ser correspondidos.
A documentação disponível em info diff
explica ainda mais:
Showing Differences Without Context
The "normal" diff
output format shows each hunk of differences without any surrounding context. Sometimes such output is the clearest way to see how lines have changed, without the clutter of nearby unchanged lines (although you can get similar results with the context or unified formats by using 0 lines of context). However, this format is no longer widely used for sending out patches; for that purpose, the context format and the unified format are superior.
Normal format is the default for compatibility with older versions of diff
and the POSIX standard. Use the --normal
option to select this output format explicitly.
Detailed Description of Normal Format
The normal output format consists of one or more hunks of
differences; each hunk shows one area where the files differ. Normal
format hunks look like this:
CHANGE-COMMAND
< FROM-FILE-LINE
< FROM-FILE-LINE...
---
> TO-FILE-LINE
> TO-FILE-LINE...
There are three types of change commands. Each consists of a line
number or comma-separated range of lines in the first file, a single
character indicating the kind of change to make, and a line number or
comma-separated range of lines in the second file. All line numbers
are the original line numbers in each file. The types of change
commands are:
LaR
Add the lines in range R of the second file after line L of the
first file. For example, 8a12,15
means append lines 12-15 of
file 2 after line 8 of file 1; or, if changing file 2 into file 1,
delete lines 12-15 of file 2.
FcT
Replace the lines in range F of the first file with lines in range
T of the second file. This is like a combined add and delete, but
more compact. For example, 5,7c8,10
means change lines 5-7 of
file 1 to read as lines 8-10 of file 2; or, if changing file 2 into
file 1, change lines 8-10 of file 2 to read as lines 5-7 of file 1.
RdL
Delete the lines in range R from the first file; line L is where
they would have appeared in the second file had they not been
deleted. For example, 5,7d3
means delete lines 5-7 of file 1;
or, if changing file 2 into file 1, append lines 5-7 of file 1
after line 3 of file 2.
Veja também:
Então, para ver as laranjas, você teria que diferenciá-las lado a lado ou usando o contexto unificado.
No exemplo:
$ diff -y file1 file2
apples <
oranges oranges
> apples
$ diff -u file1 file2
@@ -1,2 +1,2 @@
-apples
oranges
+apples