Merge branch 'rs/blame-refactor' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:36:47 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:36:47 +0000 (13:36 -0700)
commitddaa722229fa7e86fbcd77aa642a54b8ba551617
treef718ad538cb0401b559c53592c22cbfed57c3568
parent6985153bfbfca002f1f79988a9f6d4b084f0f01a
parent60d85e110b520ee5c6839380e5bb3d6e38571a74
Merge branch 'rs/blame-refactor' into next

* rs/blame-refactor:
  blame: simplify prepare_lines()
  blame: factor out get_next_line()
builtin/blame.c