diff-files: document --ours etc.
authorAndreas Heiduk <asheiduk@gmail.com>
Tue, 11 Apr 2017 14:39:50 +0000 (16:39 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Apr 2017 23:15:25 +0000 (16:15 -0700)
commit47242cd...037483896bb2b042e6a02c66b65b07d6
treed2dedd5...f558f3aa70238ed426eee64993d3959ccopy hash to clipboard (tree)
parent49800c9...0790cc7465d1b03e08d472ffd8684808copy hash to clipboard (diff)
Documentation/git-diff.txt