Andreas Heiduk 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 str
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
---
Documentation/git-diff.txt | 8
1 file changed, 8 insertions(+)
diff --git a/Docu
2 matches
Mail list logo
