Andreas Heiduk <ashei...@gmail.com> writes: > 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.
This is probably a shared issue with the original text for "diff-files", but I think we must stress that these options make sense only when you are in the middle of conflict resolution. In addition, unlike "diff-files", if these were to appear in the general "git diff" documentation, it also must stress that these options are only about comparing the index and the working tree files, e.g. "git diff --ours HEAD^ HEAD" does not make sense.
