Merge branch 'lp/maint-diff-three-dash-with-graph' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:40 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:40 +0000 (21:11 -0700)
"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

1  2 
diff.c
log-tree.c
t/t4202-log.sh

diff --cc diff.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge