Merge branch 'jk/maint-diff-grep-textconv' into next
commit790337bb8da999d2fd69b7238d2e203b6d89e1f9
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:17:11 +0000 (4 08:17 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:17:11 +0000 (4 08:17 -0500)
tree1ab046fe734e6f2c488e045e0b8e0f34578138d7
parent40e3e48ecfb90a307daa182c882230f9c5c20d79
parentb1c2f57db326c43ec286855b396fb16b4890cf2d
Merge branch 'jk/maint-diff-grep-textconv' into next

Fixes inconsistent use of textconv with "git log -G".

* jk/maint-diff-grep-textconv:
  diff_grep: use textconv buffers for add/deleted files