Merge branch 'jc/diff-ws-error-highlight'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 19:30:14 +0000 (12:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2015 19:30:14 +0000 (12:30 -0700)
commitabecdde...25e9c39857b963c8a0cffbbdc135caa9
tree2a3be06...a6b4edf77cc4e974fec5049e6ce8b535copy hash to clipboard (tree)
parent961abca...2c532626df631c851688ec433095d93dcopy hash to clipboard (diff)
parent3f4f17b...1b30262041a2248ef9f966f6248aed50copy hash to clipboard (diff)
diff.c