Merge branch 'ab/blame-textconv'
commit4af574dbdc543b43e16838ed69890470b763136d
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (27 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (27 12:07 -0700)
tree47cc6f4185420bf3ac405a4018cc25d7047af21d
parenta81f1a825bebe1b4d202832b804957d1547d7f60
parent37d29e1051ef8406d21f8b284a659080fcfe3f72
Merge branch 'ab/blame-textconv'

* ab/blame-textconv:
  t/t8006: test textconv support for blame
  textconv: support for blame
  textconv: make the API public

Conflicts:
diff.h
builtin/blame.c
diff.c
diff.h