Merge branch 'jk/diffcore-break-divzero' into maint
commit15af30e72f6b86740d6e155d58bc823df72dd84f
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:47 +0000 (12 13:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:41:47 +0000 (12 13:41 -0700)
treea4aa9484b42573f669f87939ee113f364476a257
parent788e98f8c0a09d71bd1ed64a71c941a8d10d91c4
parente7b00c57640fa2bf11e4218b588f51cc5a9a754e
Merge branch 'jk/diffcore-break-divzero' into maint

* jk/diffcore-break-divzero:
  diffcore-break: don't divide by zero