blob: 25fc22b8e34e391158d715f6a14d25f9bc6df859 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
Add --git option to generate output compatible with 'git diff -p'.
This would behave like 'diff -p', except that it would also generate
the extended headers 'old mode', 'new mode', 'deleted file mode', and
'new file mode', and it would quote file names with unusual characters.
GNU patch already parses this format.
Add --include option (opposite of --exclude).
Look into sdiff improvement here:
http://www.pkix.net/~chuck/sdiff2.diff
Propagate stderr from subprocess so that diff3 does
a better job of explaining _why_:
> $ diff3 /bin/sh /bin/false /bin/mv
> diff3: subsidiary program 'diff' failed (exit status 2)
|