[bug-diffutils] bug#44378: diff Manual

2020-11-01 Thread Michael Partridge
Nowhere does the diff man page mention the from-file, to-file syntax as it does in the full documentation: > In the simplest case, two file names from-file and to-file are given, and > diff compares the contents of from-file and to-file. > Source: https://www.gnu.org/software/diffutils/manual/dif

[bug-diffutils] bug#44379: File name affects patch patched file regardless of diff

2020-11-01 Thread Michael Partridge
Reproduce with: diff -u driver.c.master driver.c > d.diff patch < d.diff driver.c is patched instead of the intended driver.c.master. If I change the name to master_driver.c it works as intended. The use case: When I want to merge a couple lines of changes from another git branch, I sometimes re