git-diff: do not turn off -p/-M with any diff options.
[git.git] / Documentation / technical /
drwxr-xr-x   ..
-rw-r--r-- 4246 trivial-merge.txt