1*0b459c2cSDavid du ColombierUser-visible changes in version 2.7: 2*0b459c2cSDavid du Colombier 3*0b459c2cSDavid du Colombier* New diff option: --binary (useful only on non-Posix hosts) 4*0b459c2cSDavid du Colombier* diff -b and -w now ignore line incompleteness; -B no longer does this. 5*0b459c2cSDavid du Colombier* cmp -c now uses locale to decide which output characters to quote. 6*0b459c2cSDavid du Colombier* Help and version messages are reorganized. 7*0b459c2cSDavid du Colombier 8*0b459c2cSDavid du Colombier 9*0b459c2cSDavid du ColombierUser-visible changes in version 2.6: 10*0b459c2cSDavid du Colombier 11*0b459c2cSDavid du Colombier* New cmp, diff, diff3, sdiff option: --help 12*0b459c2cSDavid du Colombier* A new heuristic for diff greatly reduces the time needed to compare 13*0b459c2cSDavid du Colombier large input files that contain many differences. 14*0b459c2cSDavid du Colombier* Partly as a result, GNU diff's output is not exactly the same as before. 15*0b459c2cSDavid du Colombier Usually it is a bit smaller, but sometimes it is a bit larger. 16*0b459c2cSDavid du Colombier 17*0b459c2cSDavid du Colombier 18*0b459c2cSDavid du ColombierUser-visible changes in version 2.5: 19*0b459c2cSDavid du Colombier 20*0b459c2cSDavid du Colombier* New cmp option: -v --version 21*0b459c2cSDavid du Colombier 22*0b459c2cSDavid du Colombier 23*0b459c2cSDavid du ColombierUser-visible changes in version 2.4: 24*0b459c2cSDavid du Colombier 25*0b459c2cSDavid du Colombier* New cmp option: --ignore-initial=BYTES 26*0b459c2cSDavid du Colombier* New diff3 option: -T --initial-tab 27*0b459c2cSDavid du Colombier* New diff option: --line-format=FORMAT 28*0b459c2cSDavid du Colombier* New diff group format specifications: 29*0b459c2cSDavid du Colombier <PRINTF_SPEC>[eflmnEFLMN] 30*0b459c2cSDavid du Colombier A printf spec followed by one of the following letters 31*0b459c2cSDavid du Colombier causes the integer corresponding to that letter to be 32*0b459c2cSDavid du Colombier printed according to the printf specification. 33*0b459c2cSDavid du Colombier E.g. `%5df' prints the number of the first line in the 34*0b459c2cSDavid du Colombier group in the old file using the "%5d" format. 35*0b459c2cSDavid du Colombier e: line number just before the group in old file; equals f - 1 36*0b459c2cSDavid du Colombier f: first line number in group in the old file 37*0b459c2cSDavid du Colombier l: last line number in group in the old file 38*0b459c2cSDavid du Colombier m: line number just after the group in old file; equals l + 1 39*0b459c2cSDavid du Colombier n: number of lines in group in the old file; equals l - f + 1 40*0b459c2cSDavid du Colombier E, F, L, M, N: likewise, for lines in the new file 41*0b459c2cSDavid du Colombier %(A=B?T:E) 42*0b459c2cSDavid du Colombier If A equals B then T else E. A and B are each either a decimal 43*0b459c2cSDavid du Colombier constant or a single letter interpreted as above. T and E are 44*0b459c2cSDavid du Colombier arbitrary format strings. This format spec is equivalent to T if 45*0b459c2cSDavid du Colombier A's value equals B's; otherwise it is equivalent to E. For 46*0b459c2cSDavid du Colombier example, `%(N=0?no:%dN) line%(N=1?:s)' is equivalent to `no lines' 47*0b459c2cSDavid du Colombier if N (the number of lines in the group in the the new file) is 0, 48*0b459c2cSDavid du Colombier to `1 line' if N is 1, and to `%dN lines' otherwise. 49*0b459c2cSDavid du Colombier %c'C' 50*0b459c2cSDavid du Colombier where C is a single character, stands for the character C. C may not 51*0b459c2cSDavid du Colombier be a backslash or an apostrophe. E.g. %c':' stands for a colon. 52*0b459c2cSDavid du Colombier %c'\O' 53*0b459c2cSDavid du Colombier where O is a string of 1, 2, or 3 octal digits, stands for the 54*0b459c2cSDavid du Colombier character with octal code O. E.g. %c'\0' stands for a null character. 55*0b459c2cSDavid du Colombier* New diff line format specifications: 56*0b459c2cSDavid du Colombier <PRINTF_SPEC>n 57*0b459c2cSDavid du Colombier The line number, printed with <PRINTF_SPEC>. 58*0b459c2cSDavid du Colombier E.g. `%5dn' prints the line number with a "%5d" format. 59*0b459c2cSDavid du Colombier %c'C' 60*0b459c2cSDavid du Colombier %c'\O' 61*0b459c2cSDavid du Colombier The character C, or with octal code O, as above. 62*0b459c2cSDavid du Colombier* Supported <PRINTF_SPEC>s have the same meaning as with printf, but must 63*0b459c2cSDavid du Colombier match the extended regular expression %-*[0-9]*(\.[0-9]*)?[doxX]. 64*0b459c2cSDavid du Colombier* The format spec %0 introduced in version 2.1 has been removed, since it 65*0b459c2cSDavid du Colombier is incompatible with printf specs like %02d. To represent a null char, 66*0b459c2cSDavid du Colombier use %c'\0' instead. 67*0b459c2cSDavid du Colombier* cmp and diff now conform to Posix.2 (ISO/IEC 9945-2:1993) 68*0b459c2cSDavid du Colombier if the underlying system conforms to Posix: 69*0b459c2cSDavid du Colombier - Some messages' wordings are changed in minor ways. 70*0b459c2cSDavid du Colombier - ``White space'' is now whatever C's `isspace' says it is. 71*0b459c2cSDavid du Colombier - When comparing directories, if `diff' finds a file that is not a regular 72*0b459c2cSDavid du Colombier file or a directory, it reports the file's type instead of diffing it. 73*0b459c2cSDavid du Colombier (As usual, it follows symbolic links first.) 74*0b459c2cSDavid du Colombier - When signaled, sdiff exits with the signal's status, not with status 2. 75*0b459c2cSDavid du Colombier* Now portable to hosts where int, long, pointer, etc. are not all the same 76*0b459c2cSDavid du Colombier size. 77*0b459c2cSDavid du Colombier* `cmp - -' now works like `diff - -'. 78*0b459c2cSDavid du Colombier 79*0b459c2cSDavid du Colombier 80*0b459c2cSDavid du ColombierUser-visible changes in version 2.3: 81*0b459c2cSDavid du Colombier 82*0b459c2cSDavid du Colombier* New diff option: --horizon-lines=lines 83*0b459c2cSDavid du Colombier 84*0b459c2cSDavid du Colombier 85*0b459c2cSDavid du ColombierUser-visible changes in version 2.1: 86*0b459c2cSDavid du Colombier 87*0b459c2cSDavid du Colombier* New diff options: 88*0b459c2cSDavid du Colombier --{old,new,unchanged}-line-format='format' 89*0b459c2cSDavid du Colombier --{old,new,unchanged,changed}-group-format='format' 90*0b459c2cSDavid du Colombier -U 91*0b459c2cSDavid du Colombier* New diff3 option: 92*0b459c2cSDavid du Colombier -A --show-all 93*0b459c2cSDavid du Colombier* diff3 -m now defaults to -A, not -E. 94*0b459c2cSDavid du Colombier* diff3 now takes up to three -L or --label options, not just two. 95*0b459c2cSDavid du Colombier If just two options are given, they refer to the first two input files, 96*0b459c2cSDavid du Colombier not the first and third input files. 97*0b459c2cSDavid du Colombier* sdiff and diff -y handle incomplete lines. 98*0b459c2cSDavid du Colombier 99*0b459c2cSDavid du Colombier 100*0b459c2cSDavid du ColombierUser-visible changes in version 2.0: 101*0b459c2cSDavid du Colombier 102*0b459c2cSDavid du Colombier* Add sdiff and cmp programs. 103*0b459c2cSDavid du Colombier* Add Texinfo documentation. 104*0b459c2cSDavid du Colombier* Add configure script. 105*0b459c2cSDavid du Colombier* Improve diff performance. 106*0b459c2cSDavid du Colombier* New diff options: 107*0b459c2cSDavid du Colombier-x --exclude 108*0b459c2cSDavid du Colombier-X --exclude-from 109*0b459c2cSDavid du Colombier-P --unidirectional-new-file 110*0b459c2cSDavid du Colombier-W --width 111*0b459c2cSDavid du Colombier-y --side-by-side 112*0b459c2cSDavid du Colombier--left-column 113*0b459c2cSDavid du Colombier--sdiff-merge-assist 114*0b459c2cSDavid du Colombier--suppress-common-lines 115*0b459c2cSDavid du Colombier* diff options renamed: 116*0b459c2cSDavid du Colombier--label renamed from --file-label 117*0b459c2cSDavid du Colombier--forward-ed renamed from --reversed-ed 118*0b459c2cSDavid du Colombier--paginate renamed from --print 119*0b459c2cSDavid du Colombier--entire-new-file renamed from --entire-new-files 120*0b459c2cSDavid du Colombier--new-file renamed from --new-files 121*0b459c2cSDavid du Colombier--all-text removed 122*0b459c2cSDavid du Colombier* New diff3 options: 123*0b459c2cSDavid du Colombier-v --version 124*0b459c2cSDavid du Colombier* Add long-named equivalents for other diff3 options. 125*0b459c2cSDavid du Colombier* diff options -F (--show-function-line) and -I (--ignore-matching-lines) 126*0b459c2cSDavid du Colombier can now be given more than once. 127