Merge branch 'ah/diff-files-ours-theirs-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:16 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:16 +0000 (21:37 -0700)
commit7203baf...88ff0a4f8702b0eee38bc36d7e542a81
tree56df118...eed5ed0464d2d98c8ff6ae42e992ac54copy hash to clipboard (tree)
parent74a74be...e9676a21c089f569b75d386398a4867bcopy hash to clipboard (diff)
parent47242cd...037483896bb2b042e6a02c66b65b07d6copy hash to clipboard (diff)