index 5c8c1d95a89b15e936816f486a8114cbc6788fb9..4ef03578ebc58f3b678e8805644ae8c0ad4b998b 100644 (file)
-------
include::diff-options.txt[]
--1 -2 -3 or --base --ours --theirs, and -0::
+-1 --base::
+-2 --ours::
+-3 --theirs::
+-0::
Diff against the "base" version, "our branch" or "their
branch" respectively. With these options, diffs for
merged entries are not shown.
-q::
Remain silent even on nonexistent files
-Output format
--------------
+
include::diff-format.txt[]