Andreas Heiduk 47242cd103 diff-files: document --ours etc. ...

git-diff understands "--ours", "--theirs" and "--base" for files with
conflicts. But so far they were not documented for the central diff
command but only for diff-files.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2017-04-13 16:15:25 -07:00

6.0 KiB

Raw Blame History

View Raw