Merge branch 'mg/doc-word-diff-example' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:11 +0000 (17:21 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:11 +0000 (17:21 -0500)
commit2cc3640...df4eb919c4ad3da0561d1bbdb9e0c0c4
tree94caf74...ceb360e6fed5e3c23c6cb52323c85658copy hash to clipboard (tree)
parent712a12e...0612ec594d9cc4235a9e0825a50d3097copy hash to clipboard (diff)
parent2c15c00...511e03e775fa5f2e44b37ae9313833b0copy hash to clipboard (diff)