Merge branch 'mk/maint-graph-infinity-loop' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:32:18 +0000 (07:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:32:18 +0000 (07:32 -0800)
* mk/maint-graph-infinity-loop:
  graph.c: infinite loop in git whatchanged --graph -m

1  2 
graph.c
t/t4202-log.sh

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