Merge branch 'lp/maint-diff-three-dash-with-graph' into maint
commit35977f2316d68faa850222e19d4baec407511756
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:40 +0000 (1 21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:40 +0000 (1 21:11 -0700)
treee1ed285b4b8fd0cb891e0c0be25eb309cf39c4fa
parenta4da3388fd83e4b31273d71bebf8a92becd8f60c
parente2c59667ed0a495998b911628de5389a0ee9a728
Merge branch 'lp/maint-diff-three-dash-with-graph' into maint

"log -p --graph" used with "--stat" had a few formatting error.

By Lucian Poston
* lp/maint-diff-three-dash-with-graph:
  t4202: add test for "log --graph --stat -p" separator lines
  log --graph: fix break in graph lines
  log --graph --stat: three-dash separator should come after graph lines
diff.c
log-tree.c
t/t4202-log.sh