Merge branch 'jk/blame-line-porcelain'
commitb7aba2ef3450832828148e1a71b6a7198614b43d
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 16:58:31 +0000 (23 09:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 16:58:31 +0000 (23 09:58 -0700)
treec9d052589c13471a50ecfeb96692b2c4243f0607
parent391b14278e59f46ceda3b055fdc12527bc2c87fb
parented747dd5216ba1fe6fa59da9585dcd6cced202bb
Merge branch 'jk/blame-line-porcelain'

* jk/blame-line-porcelain:
  blame: add --line-porcelain output format
  blame: refactor porcelain output
  add tests for various blame formats