Merge branch 'ap/trackinfo'v1.6.0-rc0
commit93310a40eb022a0e36e7c618921931d8ffc31fd1
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:27 +0000 (20 18:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:27 +0000 (20 18:00 -0700)
treed9fe0d7cb5a39cafa2ff3d2be34493d630d79385
parentd1f2e1696ce168b3a70b59be7c58fa96c530d4fb
parent4de53ce0437e7326908c4a0571ac4ff9b8d5aeff
Merge branch 'ap/trackinfo'

* ap/trackinfo:
  Reword "your branch has diverged..." lines to reduce line length