3bbe3f672e
Some of the modifications from the previous summer of code has been integrated Modification for compatibility with GNU diff output has been added Main difference with OpenBSD: Implement multiple GNU diff options: * --ignore-file-name-case * --no-ignore-file-name-case * --normal * --tabsize * --strip-trailing-cr Make diff -p compatible with GNU diff Implement diff -l Make diff -r compatible with GNU diff Capsicumize diffing 2 regular files Add a simple test suite Approved by: AsiaBSDcon devsummit Obtained from: OpenBSD, GSoC Relnotes: yes
37 lines
382 B
Plaintext
37 lines
382 B
Plaintext
*** input_c1.in
|
|
--- input_c2.in
|
|
***************
|
|
*** 1,15 ****
|
|
/*
|
|
* A comment
|
|
*
|
|
! * And another bla
|
|
*
|
|
! * And yet another
|
|
*/
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
printf("something");
|
|
|
|
return (0);
|
|
}
|
|
--- 1,16 ----
|
|
/*
|
|
* A comment
|
|
*
|
|
! * And another bla
|
|
*
|
|
! * and yet another
|
|
*/
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
+
|
|
printf("something");
|
|
|
|
return (0);
|
|
}
|