fddcb7b82f
etcupdate(8) requires that option, while GNU diff supports many more variation of that options, their behaviour beside the simple verion implemented here are quite inconsistent as such I do not plan to implement those. The only special keyword supported by this implementation are: %< and %> %= is not implemented as the documentation of GNU diff says: common lines, but it actually when tested print the changes from the first file
28 lines
281 B
Plaintext
28 lines
281 B
Plaintext
/*
|
|
* A comment
|
|
*
|
|
<<<<<<< (local)
|
|
* And another bla
|
|
=======
|
|
* And another bla
|
|
>>>>>>> (stock)
|
|
*
|
|
<<<<<<< (local)
|
|
* And yet another
|
|
=======
|
|
* and yet another
|
|
>>>>>>> (stock)
|
|
*/
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
<<<<<<< (local)
|
|
=======
|
|
|
|
>>>>>>> (stock)
|
|
printf("something");
|
|
|
|
return (0);
|
|
}
|